Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 16:55:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/tests
History
ZappoMan 3a8c5018ee Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 
Conflicts:
	interface/src/Application.h
	libraries/entities/src/EntityTreeElement.h
	libraries/models/src/ModelItem.cpp
	libraries/models/src/ModelItem.h
	libraries/models/src/ModelTree.cpp
	libraries/models/src/ModelTree.h
	libraries/models/src/ModelTreeElement.cpp
	libraries/networking/src/PacketHeaders.h
	libraries/octree/src/OctreeEditPacketSender.cpp
	libraries/octree/src/OctreeEditPacketSender.h
2014-08-04 12:01:23 -07:00
..
audio library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
jitter tweak format of report 2014-08-01 15:25:03 -07:00
metavoxels library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
networking code cleanup 2014-08-01 16:49:21 -07:00
octree Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities 2014-07-31 10:34:23 -07:00
physics library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
shared library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00
CMakeLists.txt library cleanup to suppress warnings on cmake 3.0 2014-07-30 15:06:15 -07:00