Seth Alves 712386f256 Merge branch 'master' of github.com:highfidelity/hifi into word-align--memorystorage		2017-05-11 06:55:49 -07:00
..
src/avatars-renderer	Merge branch 'master' of github.com:highfidelity/hifi into word-align--memorystorage	2017-05-11 06:55:49 -07:00
CMakeLists.txt	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00