scrawl 4fa303d7c4 Merge branch 'master' into HEAD ... Conflicts: CMakeLists.txt apps/launcher/CMakeLists.txt		2014-11-18 17:43:51 +01:00
..
icons/tango	Added a settings page to the launcher	2014-01-27 20:14:02 +01:00
images	Move windows platform specific files into a common directory.	2014-09-05 22:36:33 +10:00
launcher.qrc	Added a settings page to the launcher	2014-01-27 20:14:02 +01:00