diff options
| author | Andrew <forkk@forkk.net> | 2013-01-25 12:35:14 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-01-25 12:35:14 -0600 |
| commit | f5ee069ea989a07915eb20c62ec4e812dfa9e701 (patch) | |
| tree | 7d2895bf49925aa6ef7cc91caf9a01de694b2eee /data/settingsbase.h | |
| parent | 3b422b54aa13be4eb59c80b1f7bb2a514aac583f (diff) | |
| parent | 00893b3cfc68f12c09e84643d255044a488b0eb6 (diff) | |
| download | PrismLauncher-f5ee069ea989a07915eb20c62ec4e812dfa9e701.tar.gz PrismLauncher-f5ee069ea989a07915eb20c62ec4e812dfa9e701.tar.bz2 PrismLauncher-f5ee069ea989a07915eb20c62ec4e812dfa9e701.zip | |
Merge branch 'master' of git://github.com/peterix/MultiMC5
Diffstat (limited to 'data/settingsbase.h')
| -rw-r--r-- | data/settingsbase.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/settingsbase.h b/data/settingsbase.h index 8a7e7e77..71f0e30d 100644 --- a/data/settingsbase.h +++ b/data/settingsbase.h @@ -18,7 +18,7 @@ #include <QSettings> -#include "../util/settingsmacros.h" +#include "settingsmacros.h" class SettingsBase : public QSettings { @@ -28,6 +28,6 @@ public: }; -#include "../util/settingsmacrosundef.h" +#include "settingsmacrosundef.h" #endif // SETTINGSBASE_H |