Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 15:59:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/tests
History
ZappoMan 32d5eb3cea Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	assignment-client/CMakeLists.txt
	interface/CMakeLists.txt
	libraries/entities/CMakeLists.txt
	libraries/models/src/ModelEditPacketSender.cpp
	libraries/models/src/ModelEditPacketSender.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
	libraries/octree/src/OctreePacketData.h
	libraries/octree/src/OctreeQuery.cpp
	libraries/particles/src/ParticleEditPacketSender.cpp
	libraries/particles/src/ParticleEditPacketSender.h
	libraries/script-engine/CMakeLists.txt
	tests/octree/CMakeLists.txt
2014-08-18 15:16:35 -07:00
..
audio repair build of various tools 2014-08-08 13:17:54 -07:00
jitter fix warning 2014-08-17 14:10:42 -07:00
metavoxels repair build of various tools 2014-08-08 13:17:54 -07:00
networking repair build of various tools 2014-08-08 13:17:54 -07:00
octree Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-08-18 15:16:35 -07:00
physics repair build of various tools 2014-08-08 13:17:54 -07:00
shared repair build of various tools 2014-08-08 13:17:54 -07:00
CMakeLists.txt library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00