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

Started working on task system and login system.

2013-02-05 16:34:20 -06:00

logindialog.h

Started working on task system and login system.

2013-02-05 16:34:20 -06:00

logindialog.ui

Started working on task system and login system.

2013-02-05 16:34:20 -06:00

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

Added mod edit window.

2013-01-15 19:04:10 -06:00

modeditwindow.h

Added mod edit window.

2013-01-15 19:04:10 -06:00

modeditwindow.ui

Added mod edit window.

2013-01-15 19:04:10 -06:00

newinstancedialog.cpp

Added new instance dialog.

2013-02-01 13:07:36 -06:00

newinstancedialog.h

Added new instance dialog.

2013-02-01 13:07:36 -06:00

newinstancedialog.ui

Added new instance dialog.

2013-02-01 13:07:36 -06:00

settingsdialog.cpp

Split MultiMC up into a few separate libraries.

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

settingsdialog.h

Implemented settings dialog.

2013-01-28 15:35:09 -06:00

settingsdialog.ui

Implemented settings dialog.

2013-01-28 15:35:09 -06:00

taskdialog.cpp

Started working on task system and login system.

2013-02-05 16:34:20 -06:00

taskdialog.h

Started working on task system and login system.

2013-02-05 16:34:20 -06:00

taskdialog.ui

Started working on task system and login system.

2013-02-05 16:34:20 -06:00