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

Conflicts:
	CMakeLists.txt
	gui/mainwindow.cpp
	main.cpp

2013-02-21 20:40:32 +01:00

..

aboutdialog.cpp

Implement About Dialog

2013-02-21 19:35:52 +01:00

aboutdialog.h

Implement About Dialog

2013-02-21 19:35:52 +01:00

aboutdialog.ui

Implement About Dialog

2013-02-21 19:35:52 +01:00

browserdialog.cpp

implement desktop shortcut creation. windows code not tested.

2013-02-13 04:03:15 +01:00

browserdialog.h

add first iteration of the integrated browser

2013-02-13 00:35:35 +01:00

browserdialog.ui

add first iteration of the integrated browser

2013-02-13 00:35:35 +01:00

logindialog.cpp

…

logindialog.h

…

logindialog.ui

…

mainwindow.cpp

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

2013-02-21 20:40:32 +01:00

mainwindow.h

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

2013-02-21 20:40:32 +01:00

mainwindow.ui

Merge https://github.com/Forkk/MultiMC5

2013-02-06 07:09:32 +01:00

modeditwindow.cpp

…

modeditwindow.h

…

modeditwindow.ui

…

newinstancedialog.cpp

…

newinstancedialog.h

…

newinstancedialog.ui

…

settingsdialog.cpp

Split MultiMC up into a few separate libraries.

2013-02-20 19:10:09 -06:00

settingsdialog.h

…

settingsdialog.ui

…

taskdialog.cpp

…

taskdialog.h

…

taskdialog.ui

…