Dante Ruiz b00d7d763a Merge branch 'master' of github.com:highfidelity/hifi into tabletwebview-fix-links		2017-05-01 22:45:42 +01:00
..
external
i18n
icon
resources	Merge branch 'master' of github.com:highfidelity/hifi into tabletwebview-fix-links	2017-05-01 22:45:42 +01:00
src	Merge pull request #10319 from hyperlogic/feature/head-standard-action	2017-05-01 13:03:23 -07:00
ui
CMakeLists.txt	Moving face and eye trackers out of interface	2017-04-28 23:28:17 -07:00
interface.exe.manifest