diff options
| author | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-02-21 20:40:32 +0100 |
|---|---|---|
| committer | Orochimarufan <orochimarufan.x3@gmail.com> | 2013-02-21 20:40:32 +0100 |
| commit | ca1fd44637ad5ce9ec287ff71addd38e98f66f4f (patch) | |
| tree | 3642ff488dd144b014131de48bf926c6e3d1043c /gui/mainwindow.h | |
| parent | 576e979df4a54df9bf5ffeae3559f488b3045268 (diff) | |
| parent | 50d1f62bf4a8d70466100463238228bc8305a5c7 (diff) | |
| download | MultiMC-ca1fd44637ad5ce9ec287ff71addd38e98f66f4f.tar MultiMC-ca1fd44637ad5ce9ec287ff71addd38e98f66f4f.tar.gz MultiMC-ca1fd44637ad5ce9ec287ff71addd38e98f66f4f.tar.lz MultiMC-ca1fd44637ad5ce9ec287ff71addd38e98f66f4f.tar.xz MultiMC-ca1fd44637ad5ce9ec287ff71addd38e98f66f4f.zip | |
Merge branch 'master' of http://github.com/peterix/MultiMC5
Conflicts:
CMakeLists.txt
gui/mainwindow.cpp
main.cpp
Diffstat (limited to 'gui/mainwindow.h')
| -rw-r--r-- | gui/mainwindow.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/mainwindow.h b/gui/mainwindow.h index f2dfbc70..a57b8db4 100644 --- a/gui/mainwindow.h +++ b/gui/mainwindow.h @@ -18,7 +18,7 @@ #include <QMainWindow> -#include "data/instancemodel.h" +#include "instancelist.h" #include "data/loginresponse.h" namespace Ui @@ -75,7 +75,7 @@ private slots: private: Ui::MainWindow *ui; - InstanceModel instList; + InstanceList instList; }; #endif // MAINWINDOW_H |