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
..
src/gpu	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-06 16:22:03 -07:00
CMakeLists.txt	Trying to fixup the plugins compilation	2015-07-02 00:00:00 -07:00