overte/libraries/avatars
Brad Hefta-Gaub c2171ca08f Merge branch 'master' of https://github.com/highfidelity/hifi into avatarSimulationStats
Conflicts:
	libraries/avatars/src/AvatarData.h
2017-02-08 16:52:38 -08:00
..
src Merge branch 'master' of https://github.com/highfidelity/hifi into avatarSimulationStats 2017-02-08 16:52:38 -08:00
CMakeLists.txt Avatar has no dependency on audio or recording anymore 2015-11-17 17:13:53 -08:00