Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-06 14:34:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-lubosz/libraries/avatars
History
tosh 1e6352593a Merge branch 'master' of git://github.com/worklist/hifi into 19262 
Conflicts:
	interface/src/Head.cpp
	interface/src/Util.cpp
	interface/src/main.cpp
	libraries/avatars/src/Orientation.cpp
2013-04-18 12:38:35 +02:00
..
src Merge branch 'master' of git://github.com/worklist/hifi into 19262 2013-04-18 12:38:35 +02: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