Philip Rosedale 8f40780af0 Merge pull request #3517 from ctrlaltdavid/20048 ... CR for Job #20048 - Leap - Make leapHands.js work with Leap-on-Rift		2014-09-30 21:06:45 -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 #3517 from ctrlaltdavid/20048	2014-09-30 21:06:45 -07:00
ui	Merge branch 'master' of github.com:highfidelity/hifi into 20024	2014-09-23 14:10:00 -07:00
CMakeLists.txt	dynamically load sixense lib on OS X to make avoiding hid_init crash easier	2014-09-29 12:58:01 -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