overte/libraries/voxels
Andrzej Kapolka 4d33c462fe Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
	libraries/voxels/src/VoxelTree.h
2013-05-06 09:45:57 -07:00
..
src Merge branch 'master' of https://github.com/worklist/hifi 2013-05-06 09:45:57 -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