ZappoMan d666f9ce98 Merge branch 'master' of https://github.com/highfidelity/hifi into editToolsImprovements ... Conflicts: examples/editModels.js		2014-10-02 15:17:59 -07:00
..
external
resources	Merge pull request #3483 from stojce/20061	2014-09-26 14:24:44 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into editToolsImprovements	2014-10-02 15:17:59 -07:00
ui	Merge branch 'master' of github.com:highfidelity/hifi into 20024	2014-09-23 14:10:00 -07:00
CMakeLists.txt	don't set SIXENSE_LIB_FILENAME for INSTALLER_BUILD	2014-10-02 11:16:25 -07:00
interface.icns
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in