Andrzej Kapolka e866c22518 Merge branch 'master' of https://github.com/worklist/hifi into kinected ... Conflicts: interface/src/Avatar.cpp		2013-07-03 10:15:11 -07:00
..
macros	pass ROOT_DIR to IncludeGLM macro instead of MACRO_DIR, include glm for AM	2013-04-15 16:08:35 -07:00
modules	Merge branch 'master' of https://github.com/worklist/hifi into kinected	2013-07-03 10:15:11 -07:00