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
..
external	remove visage related files	2015-04-17 13:40:31 -07:00
icon	fix check for debug/release icon	2015-01-30 15:41:44 -08:00
resources	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-03 06:17:35 -07:00
src	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-06 16:22:03 -07:00
ui	Avatar collision sounds.	2015-06-26 16:23:16 -07:00
CMakeLists.txt	Merge remote-tracking branch 'upstream/master' into plugins	2015-07-03 06:17:35 -07:00
interface_en.ts	remove more references to voxels	2015-01-07 16:09:56 -08:00
InterfaceConfig.h.in	Working on mac compilability	2015-07-01 23:03:33 -07:00
InterfaceVersion.h.in