howard-stearns 851911f55a Merge branch 'master' of https://github.com/highfidelity/hifi into update-from-master-1		2017-05-18 15:28:40 -07:00
..
external
i18n
icon
resources	Merge pull request #10471 from hyperlogic/feature/ik-flex-coeff	2017-05-17 16:48:50 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into update-from-master-1	2017-05-18 15:28:40 -07:00
ui
CMakeLists.txt	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
interface.exe.manifest