Brad Davis 7955eeda28 Merge branch 'master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/ui/ApplicationOverlay.h		2015-06-12 15:49:35 -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-06-12 15:49:35 -07:00
CMakeLists.txt	merging and updating	2015-05-20 16:50:43 -07:00