3 Commits

Author	SHA1	Message	Date
Andrew	4ca35a760d	Fixed a lot of MSVC problems	2013-02-25 14:44:36 -06:00
Andrew	b56b819c35	Fixed some formatting.	2013-02-25 13:39:07 -06:00
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