Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-07 17:40:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-AleziaKurdis/libraries/avatars
History
ZappoMan 6cf8ec32a7 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	libraries/avatars/src/AvatarData.cpp
	libraries/avatars/src/AvatarData.h
2013-05-20 12:31:35 -07:00
..
src Merge branch 'master' of https://github.com/worklist/hifi 2013-05-20 12:31:35 -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