Merge branch 'dev' into rt-cli

2017-02-14 00:15:23 +01:00
parent a04b3eefba 6b6c08028d
commit fe83cc8134
100 changed files with 4953 additions and 1521 deletions
--- a/rtgui/options.h
+++ b/rtgui/options.h
@@ -345,7 +345,6 @@ extern Glib::ustring argv0;
 extern Glib::ustring argv1;
 extern bool simpleEditor;
 extern Glib::ustring versionString;
-extern Glib::ustring versionSuffixString;
 extern Glib::ustring paramFileExtension;

 #endif