Andrew Meadows 961dc5a231 merge andrew/thermonuclear into andrew/inertia ... Conflicts: libraries/entities/src/EntityItem.cpp libraries/entities/src/EntityItem.h		2014-11-19 15:41:53 -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 andrew/thermonuclear into andrew/inertia	2014-11-19 15:41:53 -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