Dante Ruiz b86a8b8338 Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop		2017-07-05 18:27:33 +01:00
..
external	Set up Leap Motion plugin container	2017-06-15 17:50:07 +12:00
i18n
icon
resources	Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update	2017-07-03 16:44:47 +01:00
src	Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop	2017-07-05 18:27:33 +01:00
ui	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
CMakeLists.txt	more memory-debugger	2017-06-23 08:16:48 -07:00
interface.exe.manifest