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

Conflicts:
	CMakeLists.txt
	gui/mainwindow.cpp

2013-03-28 11:37:12 -05:00

..

appsettings.cpp

Instance view, model, delegate.

2013-03-11 22:19:17 +01:00

gameupdatetask.cpp

Massive re-organization.

2013-02-26 16:47:39 -06:00

instance.cpp

Fix settings objects, instances can be started from the GUI now

2013-03-24 15:36:00 +01:00

instancelist.cpp

Property change propagation, changing instance groups, icon preview

2013-03-19 06:24:34 +01:00

instanceloader.cpp

Massive re-organization.

2013-02-26 16:47:39 -06:00

instversion.cpp

Massive re-organization.

2013-02-26 16:47:39 -06:00

instversionlist.cpp

Implemented version lists.

2013-03-28 11:33:31 -05:00

loginresponse.cpp

Massive re-organization.

2013-02-26 16:47:39 -06:00

logintask.cpp

Instance view, model, delegate.

2013-03-11 22:19:17 +01:00

minecraftprocess.cpp

Filter console output, no more sea of red when there's nothing to report.

2013-03-26 14:34:34 +01:00

pluginmanager.cpp

Massive re-organization.

2013-02-26 16:47:39 -06:00

task.cpp

Implemented version lists.

2013-03-08 13:56:26 -06:00

userinfo.cpp

Massive re-organization.

2013-02-26 16:47:39 -06:00

version.cpp

Massive re-organization.

2013-02-26 16:47:39 -06:00