overte-HifiExperiments/libraries/avatars
ZappoMan 2b27c91550 Merge branch 'master' of https://github.com/worklist/hifi into particle_server
Conflicts:
	interface/src/VoxelSystem.cpp
	interface/src/VoxelSystem.h
2013-12-04 11:40:54 -08:00
..
src Added drum sounds and voxel collision detection 2013-12-03 16:25:23 -08:00
CMakeLists.txt first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00