Merge branch 'master' into RDImport

Conflicts:
	ChangeLog
This commit is contained in:
Patrick Linstruth
2018-10-17 08:43:20 -07:00
162 changed files with 8552 additions and 18831 deletions

View File

@@ -79,6 +79,7 @@ class MainObject : public QObject
RDGroup *import_group;
bool import_verbose;
bool import_log_syslog;
bool import_log_file;
QString import_log_directory;
QString import_log_filename;
bool import_to_mono;