Merge with develop

--HG-- branch : compatibility-develop
2016-10-21 16:54:50 +02:00 · 2016-10-21 16:54:50 +02:00 · acfdb8d6fa
commit acfdb8d6fa
parent d5d4ba1e0c 7c9a242b66
1 changed files with 0 additions and 5 deletions
--- a/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp
+++ b/code/ryzom/tools/client/ryzom_installer/src/migratedialog.cpp
@ -16,9 +16,6 @@

 #include "stdpch.h"
 #include "migratedialog.h"
-
-#ifdef Q_OS_WIN32
-
 #include "configfile.h"
 #include "utils.h"

@ -179,5 +176,3 @@ void CMigrateDialog::accept()

 	QDialog::accept();
 }
-
-#endif