Brad Davis 95000eec3c Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/ui/overlays/LocalModelsOverlay.cpp		2015-07-06 16:22:03 -07:00
..
res/fonts	move fonts to sdff files, load with qrc	2015-02-06 11:48:55 -08:00
src	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-06 16:22:03 -07:00
CMakeLists.txt	Working on mac functionality	2015-07-02 18:14:12 -07:00