howard-stearns 7cee438298 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor		2017-05-26 11:36:04 -07:00
..
external
i18n
icon
resources	fixed merge conflict	2017-05-24 19:35:41 +01:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-05-26 11:36:04 -07:00
ui
CMakeLists.txt	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
interface.exe.manifest