Seth Alves 7a47250aa7 oops missed a comma		2017-05-31 10:21:10 -07:00
..
external
i18n
icon
resources	oops missed a comma	2017-05-31 10:21:10 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into head-controller	2017-05-30 13:42:20 -07:00
ui
CMakeLists.txt	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
interface.exe.manifest