trent 786838d092 Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270		2017-05-02 20:21:35 -04:00
..
external
i18n
icon
resources	Merge pull request #10343 from druiz17/tabletwebview-fix-links	2017-05-02 08:09:22 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270	2017-05-02 20:21:35 -04: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