dasha_uwu/PrismLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop

Browse source 
Conflicts:
	CMakeLists.txt
	gui/MainWindow.cpp
This commit is contained in:
Petr Mrázek 2013-12-10 07:22:22 +01:00
commit aa61bbe9e4
123 changed files with 45872 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gui/MainWindow.h
View file

@ -155,11 +155,18 @@ slots:
void startTask(Task *task);
void updateAvailable(QString repo, QString versionName, int versionId);
void activeAccountChanged();
void changeActiveAccount();
void repopulateAccountsMenu();
/*!
* Runs the DownloadUpdateTask and installs updates.
*/
void downloadUpdates(QString repo, int versionId, bool installOnExit=false);
protected:
bool eventFilter(QObject *obj, QEvent *ev);