Seth Alves df07b66872 Merge branch 'master' of github.com:highfidelity/hifi into av-ent-misc-fixes		2017-11-20 07:47:19 -08:00
..
external
i18n
icon
resources	Merge pull request #11793 from ElderOrb/FB9032	2017-11-19 11:25:35 -08:00
src	Merge branch 'master' of github.com:highfidelity/hifi into av-ent-misc-fixes	2017-11-20 07:47:19 -08:00
ui
CMakeLists.txt	Merge pull request #11612 from highfidelity/pointers	2017-10-20 13:53:52 -07:00
interface.exe.manifest