summaryrefslogtreecommitdiffstats
path: root/gui/mainwindow.h
diff options
context:
space:
mode:
authorAndrew <forkk@forkk.net>2013-01-25 12:35:14 -0600
committerAndrew <forkk@forkk.net>2013-01-25 12:35:14 -0600
commitf5ee069ea989a07915eb20c62ec4e812dfa9e701 (patch)
tree7d2895bf49925aa6ef7cc91caf9a01de694b2eee /gui/mainwindow.h
parent3b422b54aa13be4eb59c80b1f7bb2a514aac583f (diff)
parent00893b3cfc68f12c09e84643d255044a488b0eb6 (diff)
downloadMultiMC-f5ee069ea989a07915eb20c62ec4e812dfa9e701.tar
MultiMC-f5ee069ea989a07915eb20c62ec4e812dfa9e701.tar.gz
MultiMC-f5ee069ea989a07915eb20c62ec4e812dfa9e701.tar.lz
MultiMC-f5ee069ea989a07915eb20c62ec4e812dfa9e701.tar.xz
MultiMC-f5ee069ea989a07915eb20c62ec4e812dfa9e701.zip
Merge branch 'master' of git://github.com/peterix/MultiMC5
Diffstat (limited to 'gui/mainwindow.h')
-rw-r--r--gui/mainwindow.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/mainwindow.h b/gui/mainwindow.h
index 09cd0817..77245531 100644
--- a/gui/mainwindow.h
+++ b/gui/mainwindow.h
@@ -18,7 +18,7 @@
#include <QMainWindow>
-#include "../data/instancelist.h"
+#include "../data/instancemodel.h"
namespace Ui
{
@@ -55,7 +55,7 @@ private slots:
private:
Ui::MainWindow *ui;
- InstanceList instList;
+ InstanceModel instList;
};
#endif // MAINWINDOW_H