Petr Mrázek 499ee1e365 Merge branch 'master' of https://github.com/Stiepen22/MultiMC5 into develop
Conflicts:
	AppSettings.cpp
	MultiMC.pro
	main.cpp
2013-09-08 16:21:49 +02:00
..
2013-02-21 19:35:52 +01:00
2013-02-21 19:35:52 +01:00
2013-08-25 22:48:41 +02:00
2013-08-25 22:48:41 +02:00
2013-08-25 22:48:41 +02:00
2013-08-25 22:48:41 +02:00
2013-08-25 22:48:41 +02:00
2013-08-28 21:52:19 +02:00
2013-09-06 17:08:12 +02:00
2013-09-06 17:08:12 +02:00
2013-03-26 17:43:49 +01:00
2013-08-27 18:27:58 +02:00