Merge branch 'master' into gtk3

This commit is contained in:
Morgan Hardwood
2016-07-09 23:49:31 +02:00
49 changed files with 418 additions and 419 deletions

View File

@@ -63,7 +63,7 @@ protected:
BatchQueueListener* listener;
Glib::ustring autoCompleteFileName (const Glib::ustring& fileName, const Glib::ustring& format);
Glib::ustring getTempFilenameForParams( const Glib::ustring filename );
Glib::ustring getTempFilenameForParams( const Glib::ustring &filename );
bool saveBatchQueue ();
void notifyListener (bool queueEmptied);