Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-12 05:07:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of http://github.com/peterix/MultiMC5

Browse Source 
Conflicts:
	CMakeLists.txt
	gui/mainwindow.cpp
	main.cpp
This commit is contained in:
Orochimarufan
2013-02-21 20:40:32 +01:00
parent 576e979df4 50d1f62bf4
commit ca1fd44637
55 changed files with 1978 additions and 992 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gui/mainwindow.h
View File

@ -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