diff options
author | Petr Mrázek <peterix@gmail.com> | 2013-02-21 18:09:26 +0100 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2013-02-21 18:09:26 +0100 |
commit | 58379657e99a146123814fd182d6c58424e9713e (patch) | |
tree | 98b601a9edf238683857ab9ad78855cbf52a64e9 /gui/settingsdialog.cpp | |
parent | 1beef3f73cd126af9ce3805b6990c64b835a593b (diff) | |
parent | 96e4f73a94e0697ce7200e09983d447220ea5a0b (diff) | |
download | MultiMC-58379657e99a146123814fd182d6c58424e9713e.tar MultiMC-58379657e99a146123814fd182d6c58424e9713e.tar.gz MultiMC-58379657e99a146123814fd182d6c58424e9713e.tar.lz MultiMC-58379657e99a146123814fd182d6c58424e9713e.tar.xz MultiMC-58379657e99a146123814fd182d6c58424e9713e.zip |
Merge branch 'inst_rewrite' of https://github.com/Forkk/MultiMC5
Conflicts:
data/instancemodel.cpp
Diffstat (limited to 'gui/settingsdialog.cpp')
-rw-r--r-- | gui/settingsdialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp index ab4d18ee..b3c42380 100644 --- a/gui/settingsdialog.cpp +++ b/gui/settingsdialog.cpp @@ -16,7 +16,7 @@ #include "settingsdialog.h" #include "ui_settingsdialog.h" -#include "data/appsettings.h" +#include "appsettings.h" #include <QFileDialog> #include <QMessageBox> |