David Kelly b6b2f92af2 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/5028		2017-06-01 09:58:07 -07:00
..
external
i18n
icon
resources	we can sort on ignored	2017-06-01 07:29:31 -07:00
src	Oene more fix	2017-05-31 23:26:20 -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