overte/interface
Andrew Meadows 5acaaa9c3b merge andrew/thermonuclear into andrew/inertia
Conflicts:
	interface/src/entities/EntityCollisionSystem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTree.h
	libraries/entities/src/EntityTreeElement.cpp
2014-11-26 15:36:08 -08:00
..
external fix typo from overwrite of gverb/readme.txt 2014-11-26 10:41:23 -08:00
resources More typos in glsl 2014-11-24 15:38:12 -08:00
src merge andrew/thermonuclear into andrew/inertia 2014-11-26 15:36:08 -08:00
ui Revert "Worklist #20074" 2014-10-30 14:33:10 -07:00
CMakeLists.txt add offset to physics simulation 2014-11-11 10:56:31 -08:00
interface.icns
interface_en.ts importVoxels() JS override: specify file and location 2014-08-03 14:01:37 -04:00
InterfaceConfig.h.in
InterfaceVersion.h.in