overte/avatar-mixer
Andrzej Kapolka c6af08d883 Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
	avatar-mixer/src/main.cpp
2013-04-25 17:40:55 -07:00
..
src Merge branch 'master' of https://github.com/worklist/hifi 2013-04-25 17:40:55 -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