Merge with develop
This commit is contained in:
parent
d078103453
commit
bf6f28ce43
1 changed files with 0 additions and 5 deletions
|
@ -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
|
|
||||||
|
|
Loading…
Reference in a new issue