samcake 79bcf95792 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis		2017-04-11 10:00:34 -07:00
..
external
i18n
icon
resources	Merge pull request #10174 from vladest/fix-snapshot-login-cancel	2017-04-11 07:07:29 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis	2017-04-11 10:00:34 -07:00
ui	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
CMakeLists.txt	Creating new avatar rendering library, prepping for crowd rendering project	2017-04-10 10:55:04 -07:00
interface.exe.manifest