Orochimarufan cd1fdbbbc2 Merge branch 'master' of http://github.com/peterix/MultiMC5 ... Conflicts: CMakeLists.txt main.cpp		2013-03-22 14:01:54 +01:00
..
include	Merge branch 'master' of http://github.com/peterix/MultiMC5	2013-03-22 14:01:54 +01:00
src	Merge branch 'master' of http://github.com/peterix/MultiMC5	2013-03-22 14:01:54 +01:00
CMakeLists.txt	Massive re-organization.	2013-02-26 16:47:39 -06:00