Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-10-21 16:54:50 +02:00
commit acfdb8d6fa

View file

@ -16,9 +16,6 @@
#include "stdpch.h" #include "stdpch.h"
#include "migratedialog.h" #include "migratedialog.h"
#ifdef Q_OS_WIN32
#include "configfile.h" #include "configfile.h"
#include "utils.h" #include "utils.h"
@ -179,5 +176,3 @@ void CMigrateDialog::accept()
QDialog::accept(); QDialog::accept();
} }
#endif