Andrew 23474da175 Merge branch 'master' of git://github.com/peterix/MultiMC5 ...

Conflicts:
	CMakeLists.txt
	main.cpp

2013-02-25 13:31:37 -06: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

…

browserdialog.h

…

browserdialog.ui

…

consolewindow.cpp

Implement ConsoleWindow

2013-02-22 18:18:23 +01:00

consolewindow.h

Implement ConsoleWindow

2013-02-22 18:18:23 +01:00

consolewindow.ui

Implement ConsoleWindow

2013-02-22 18:18:23 +01:00

logindialog.cpp

…

logindialog.h

…

logindialog.ui

…

mainwindow.cpp

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

2013-02-25 13:31:37 -06:00

mainwindow.h

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

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

mainwindow.ui

…

modeditwindow.cpp

…

modeditwindow.h

…

modeditwindow.ui

…

newinstancedialog.cpp

…

newinstancedialog.h

…

newinstancedialog.ui

…

settingsdialog.cpp

Rewrote the settings system. It may still need some work.

2013-02-25 13:24:46 -06:00

settingsdialog.h

Rewrote the settings system. It may still need some work.

2013-02-25 13:24:46 -06:00

settingsdialog.ui

…

taskdialog.cpp

…

taskdialog.h

…

taskdialog.ui

…