Seth Alves 20c9228050 Merge branch 'head-controller' of github.com:sethalves/hifi into head-controller		2017-06-05 15:53:23 -07:00
..
external
i18n
icon
resources	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-06-05 11:36:28 -07:00
src	Merge branch 'head-controller' of github.com:sethalves/hifi into head-controller	2017-06-05 15:53:23 -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