Andrzej Kapolka 8e04c17cc2 Merge branch 'master' of https://github.com/worklist/hifi ... Conflicts: interface/src/Application.cpp		2013-05-14 14:44:22 -07:00
..
src	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-14 14:44:22 -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