ZappoMan 4298b922a2 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation ... Conflicts: libraries/avatars/src/AvatarData.cpp		2013-05-20 13:55:01 -07:00
..
src	Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation	2013-05-20 13:55:01 -07:00
CMakeLists.txt	pass ROOT_DIR to IncludeGLM macro instead of MACRO_DIR, include glm for AM	2013-04-15 16:08:35 -07:00