Merge branch 'dev' into release

# Conflicts:
#	CMakeLists.txt
#	res/about/help.gmi
#	res/about/version.gmi
#	src/app.c
#	src/ui/documentwidget.c

1 files changed, 1 insertions, 0 deletions

diff --git a/src/ui/util.h b/src/ui/util.h
index 8ca9dd53..5590d008 100644
--- a/src/ui/util.h
+++ b/src/ui/util.h
@@ -49,6 +49,7 @@ iLocalDef iBool isResize_UserEvent(const SDL_Event *d) {
 #endif
 
 int         keyMods_Sym         (int kmods); /* shift, alt, control, or gui */
+void        toString_Sym        (int key, int kmods, iString *str);
 
 iRangei     intersect_Rangei    (iRangei a, iRangei b);
 iRangei     union_Rangei        (iRangei a, iRangei b);