Brad Davis c0d84cfc54 Merge branch 'master' into plugins ... Conflicts: interface/src/Application.cpp		2015-05-21 11:04:06 -07:00
..
res/fonts	move fonts to sdff files, load with qrc	2015-02-06 11:48:55 -08:00
src	Merge branch 'master' into plugins	2015-05-21 11:04:06 -07:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/master' into offscreen	2015-04-21 13:02:38 -07:00