Merge branch 'master' into gtk3

This commit is contained in:
Morgan Hardwood
2017-01-30 23:45:46 +01:00
30 changed files with 437 additions and 333 deletions

View File

@@ -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