Howard Stearns 2da8e1ab30 Pick up an upstream/master change that didn't get picked up in a merge of my fork/branch.		2015-04-30 08:53:19 -07:00
..
res/fonts	move fonts to sdff files, load with qrc	2015-02-06 11:48:55 -08:00
src	Pick up an upstream/master change that didn't get picked up in a merge of my fork/branch.	2015-04-30 08:53:19 -07:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/master' into offscreen	2015-04-21 13:02:38 -07:00