overte-HifiExperiments/assignment-client
Andrzej Kapolka e470b1c41d Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
Conflicts:
	assignment-client/src/metavoxels/MetavoxelServer.cpp
	interface/src/MetavoxelSystem.cpp
2014-02-21 18:26:40 -08:00
..
src Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-02-21 18:26:40 -08:00
CMakeLists.txt move octree-server libs to assignment-client 2014-02-05 16:04:23 -08:00