Seth Alves c8cdad5b4e Merge branch 'master' of github.com:highfidelity/hifi into motor-action		2017-05-08 11:02:42 -07:00
..
external
i18n
icon
resources	Merge pull request #10392 from zfox23/AvailabilityLanguageChanges	2017-05-05 14:03:39 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into motor-action	2017-05-08 11:02:42 -07: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