Zach Pomerantz ca7cd61c64 Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join		2017-05-05 13:04:01 -04:00
..
external
i18n
icon
resources	Merge pull request #10363 from jherico/qmlspam	2017-05-05 08:29:12 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join	2017-05-05 13:04:01 -04:00
ui	Revert "Actually merge from master"	2017-03-24 17:56:48 -07:00
CMakeLists.txt	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
interface.exe.manifest