howard-stearns 91656a5fe5 Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options		2017-06-19 14:22:12 -07:00
..
external
i18n
icon
resources	Merge pull request #10726 from zfox23/PAL_FixGoToUser	2017-06-16 18:08:11 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options	2017-06-19 14:22:12 -07:00
ui
CMakeLists.txt	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
interface.exe.manifest