diff options
author | Petr Mrázek <peterix@gmail.com> | 2013-09-22 14:03:05 +0200 |
---|---|---|
committer | Petr Mrázek <peterix@gmail.com> | 2013-09-22 14:03:05 +0200 |
commit | 1bed5e4023f503cb95a914c1e6886e045b7f34e2 (patch) | |
tree | 6c2a2eb34b93bdd24e7db1f9378b231084c0b27a /logic/NostalgiaInstance.h | |
parent | 930b07afd4229e952d0cd47ca62cd94235499a0c (diff) | |
parent | 9d03a9c1e3b9c24a4146adedb2971591d23b037a (diff) | |
download | MultiMC-1bed5e4023f503cb95a914c1e6886e045b7f34e2.tar MultiMC-1bed5e4023f503cb95a914c1e6886e045b7f34e2.tar.gz MultiMC-1bed5e4023f503cb95a914c1e6886e045b7f34e2.tar.lz MultiMC-1bed5e4023f503cb95a914c1e6886e045b7f34e2.tar.xz MultiMC-1bed5e4023f503cb95a914c1e6886e045b7f34e2.zip |
Merge branch 'feature_onesix_forge' into develop
Diffstat (limited to 'logic/NostalgiaInstance.h')
-rw-r--r-- | logic/NostalgiaInstance.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/logic/NostalgiaInstance.h b/logic/NostalgiaInstance.h index f2df1828..1436e48d 100644 --- a/logic/NostalgiaInstance.h +++ b/logic/NostalgiaInstance.h @@ -9,3 +9,4 @@ public: explicit NostalgiaInstance(const QString &rootDir, SettingsObject * settings, QObject *parent = 0); virtual QString getStatusbarDescription(); }; + |