Ryan Huffman bb4417acc6 Merge branch 'master' of github.com:highfidelity/hifi into webwindow-open-url		2015-03-25 10:49:24 -07:00
..
external	Building with Sixense build requires four of the SDK libraries	2015-03-21 14:22:09 -07:00
icon
resources	Rename edit-entities-commands.html to edit-commands.html	2015-03-24 13:43:10 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into webwindow-open-url	2015-03-25 10:49:24 -07:00
ui	move LOD FPS settings to Preferences	2015-03-24 13:32:22 -07:00
CMakeLists.txt	Making nsight usage optional (still defaults to on)	2015-03-16 12:59:41 -07:00
interface_en.ts
InterfaceConfig.h.in
InterfaceVersion.h.in