Olivier Prat a3e1eb997d Merge branch 'master' of http://github.com/highfidelity/hifi into shadow		2018-08-01 15:24:26 +02:00
..
compiledResources	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
external	GLAD polish	2018-01-14 00:10:05 -08:00
i18n
icon
resources	Merge pull request #13670 from ElderOrb/animate_get_more_avatars	2018-07-31 09:51:58 -07:00
src	Merge branch 'master' of http://github.com/highfidelity/hifi into shadow	2018-08-01 15:24:26 +02:00
ui
CMakeLists.txt	Remove Mac domain exception	2018-07-10 17:41:07 -07:00
interface.exe.manifest