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

Conflicts:
	CMakeLists.txt
	main.cpp

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

..

instance.h

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

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

instancelist.h

…

instanceloader.h

…

instancetypeinterface.h

…

instversion.h

…

instversionlist.h

…

libinstance_config.h

…