diff options
| author | Andrew <forkk@forkk.net> | 2013-11-04 19:58:56 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-11-04 19:58:56 -0600 |
| commit | 5083a6a8090fa03d3c1800c1f9588079ca11e9f9 (patch) | |
| tree | 7c2e88c7184a7f5acf5e7a03be5c5f0bf6904113 /MultiMC.cpp | |
| parent | dc3b0fcb2b74aeede37b08216b203cab284f7fce (diff) | |
| parent | bb7e8985f6d189de0acac6a1c3033cb16378c1fb (diff) | |
| download | MultiMC-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar MultiMC-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar.gz MultiMC-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar.lz MultiMC-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.tar.xz MultiMC-5083a6a8090fa03d3c1800c1f9588079ca11e9f9.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'MultiMC.cpp')
| -rw-r--r-- | MultiMC.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/MultiMC.cpp b/MultiMC.cpp index e04904b4..1c70fb54 100644 --- a/MultiMC.cpp +++ b/MultiMC.cpp @@ -7,8 +7,8 @@ #include <QLibraryInfo> #include <QMessageBox> -#include "gui/mainwindow.h" -#include "gui/versionselectdialog.h" +#include "gui/MainWindow.h" +#include "gui/dialogs/VersionSelectDialog.h" #include "logic/lists/InstanceList.h" #include "logic/lists/IconList.h" #include "logic/lists/LwjglVersionList.h" @@ -24,7 +24,7 @@ #include "cmdutils.h" #include <inisettingsobject.h> #include <setting.h> -#include <logger/QsLog.h> +#include "logger/QsLog.h" #include <logger/QsLogDest.h> #include "config.h" |