Commit Graph

3 Commits

Author SHA1 Message Date
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
Petr Mrázek
6bea4ec988 Use HttpMetaCache to minimize network use. 2013-09-08 02:15:20 +02:00
Petr Mrázek
6892c11e9f Move a good chunk of the singleton objects into a new QApplication subclass. 2013-09-07 04:00:58 +02:00