Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 00:03:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/libraries/avatars
History
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
..
src Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 2014-12-31 10:50:53 -08:00
CMakeLists.txt Merge branch 'master' of https://github.com/highfidelity/hifi into voxelEctomy 2014-12-31 10:50:53 -08:00