Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 11:25:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/libraries/avatars
History
Ryan Huffman dd9dea7a97 Merge remote-tracking branch 'birarda/protocol' into receive_packets 
Conflicts:
	interface/src/DatagramProcessor.cpp
	interface/src/octree/OctreePacketProcessor.cpp
	libraries/entities/src/EntityEditPacketSender.cpp
	libraries/networking/src/LimitedNodeList.h
	libraries/networking/src/NLPacket.h
2015-07-09 14:08:35 -07:00
..
src Merge remote-tracking branch 'birarda/protocol' into receive_packets 2015-07-09 14:08:35 -07:00
CMakeLists.txt remove use of include_dependency_includes and use cmake 2015-02-18 14:12:05 -08:00