Stephen Birarda edade7baba resolve conflicts on merge with upstream master		2015-05-01 16:24:16 -07:00
..
res/fonts	move fonts to sdff files, load with qrc	2015-02-06 11:48:55 -08:00
src	resolve conflicts on merge with upstream master	2015-05-01 16:24:16 -07:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/master' into offscreen	2015-04-21 13:02:38 -07:00