overte/interface
Andrew Meadows 388830c2a2 Merge branch 'bispinor' into inertia
Conflicts:
	interface/src/entities/RenderableModelEntityItem.cpp
	libraries/entities/src/BoxEntityItem.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityItem.h
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTree.h
	libraries/entities/src/EntityTreeElement.cpp
2014-11-18 10:23:38 -08:00
..
external typo 2014-10-23 14:07:42 -07:00
resources Default avatar fixes. 2014-11-14 13:02:02 -08:00
src Merge branch 'bispinor' into inertia 2014-11-18 10:23:38 -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 update the interface icon 2014-07-07 11:46:57 -07:00
interface_en.ts importVoxels() JS override: specify file and location 2014-08-03 14:01:37 -04:00
InterfaceConfig.h.in
InterfaceVersion.h.in