Philip Rosedale 9b228c9e37 Merge pull request #3497 from ZappoMan/entityPropsRescale ... add rescale support to entity properties UI		2014-09-26 16:42:15 -07:00
..
external	Bring libovr build instructions up to date	2014-08-21 19:24:09 -07:00
resources	Merge pull request #3483 from stojce/20061	2014-09-26 14:24:44 -07:00
src	Merge pull request #3497 from ZappoMan/entityPropsRescale	2014-09-26 16:42:15 -07:00
ui	Merge branch 'master' of github.com:highfidelity/hifi into 20024	2014-09-23 14:10:00 -07:00
CMakeLists.txt	initial working connection of an xbox gamepad	2014-09-23 14:48:44 -07: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