overte-JulianGro/tests
ZappoMan 9630279459 Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy
Conflicts:
	examples/editVoxels.js
	examples/fallingSand.js
	examples/growTrees.js
	interface/src/Application.cpp
	interface/src/Application.h
	libraries/avatars/CMakeLists.txt
	libraries/entities/src/EntityItem.h
2014-12-31 10:50:53 -08:00
..
audio rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
jitter rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
metavoxels rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
networking rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
octree more voxelEctomy 2014-12-30 19:58:04 -08:00
physics easier to read Bullet to GLM conversions and back 2014-12-30 13:15:57 -08:00
shared rename cmake macro to represent actual purpose 2014-12-18 16:51:20 -08:00
CMakeLists.txt the command: 2014-09-03 16:34:23 +02:00