Olivier Prat ef60f78d2b Merge branch 'master' of git://github.com/highfidelity/hifi into 21378		2017-06-14 10:16:02 +02:00
..
external
i18n
icon
resources	Merge branch 'master' of git://github.com/highfidelity/hifi into 21378	2017-06-14 10:16:02 +02:00
src	Updated from upstream master because of change of protocol	2017-06-13 10:43:25 +02:00
ui
CMakeLists.txt	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
interface.exe.manifest