Petr Mrázek aa61bbe9e4 Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Conflicts:
	CMakeLists.txt
	gui/MainWindow.cpp
2013-12-10 07:22:22 +01:00
..
2013-12-10 07:12:52 +01:00
2013-12-08 22:06:04 +01:00
2013-12-05 02:39:52 +01:00
2013-12-08 17:34:45 +01:00
2013-12-08 22:06:04 +01:00
2013-11-28 22:05:58 -06:00
2013-12-08 22:06:04 +01:00
2013-12-08 22:06:04 +01:00
2013-12-08 22:06:04 +01:00
2013-12-10 07:12:52 +01:00