Brad Hefta-Gaub 84630a8f74 Merge pull request #3484 from huffman/20024 ... Code Review for Job #20024		2014-09-25 09:33:58 -07:00
..
external	Bring libovr build instructions up to date	2014-08-21 19:24:09 -07:00
resources	Working on translucent model bits.	2014-09-19 15:31:46 -07:00
src	Merge pull request #3484 from huffman/20024	2014-09-25 09:33:58 -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