diff options
author | Sky <git@bunnies.cc> | 2013-11-06 17:02:23 +0000 |
---|---|---|
committer | Sky <git@bunnies.cc> | 2013-11-06 17:02:23 +0000 |
commit | 7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a (patch) | |
tree | 2753d1ee11dad2cf1c4ce1e8a28ead92214f2f1c /MultiMC.cpp | |
parent | dc3b0fcb2b74aeede37b08216b203cab284f7fce (diff) | |
parent | bba4ed5ab2c98c3d60a141d6a089a49716753615 (diff) | |
download | MultiMC-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar MultiMC-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar.gz MultiMC-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar.lz MultiMC-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.tar.xz MultiMC-7ddc2b6a89e1b57be1eaa44aa8018ff8af765c7a.zip |
Merge branch '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" |