Seth Alves 6b2caf8081 Merge branch 'master' of github.com:highfidelity/hifi into fix-vr-2d-vr-tablet-crash		2017-05-02 09:41:47 -07:00
..
external
i18n
icon
resources	Merge branch 'master' of github.com:highfidelity/hifi into fix-vr-2d-vr-tablet-crash	2017-05-02 09:41:47 -07:00
src	Merge pull request #10319 from hyperlogic/feature/head-standard-action	2017-05-01 13:03:23 -07:00
ui	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
CMakeLists.txt	Moving face and eye trackers out of interface	2017-04-28 23:28:17 -07:00
interface.exe.manifest