2 commits

Author	SHA1	Message	Date
pvdk	c54217d008	Merge remote-tracking branch 'upstream/master' into HEAD ... Conflicts: CMakeLists.txt components/CMakeLists.txt components/config/gamesettings.cpp	2014-02-19 19:26:07 +01:00
pvdk	095ff4e17a	Moved launcher settings stuff into components, so they can be reused in the wizard	2013-12-25 00:50:25 +01:00