Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 00:43:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/libraries/networking
History
Nissim Hadar b2a06cdb98 Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 
# Conflicts:
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/ShapeEntityItem.h
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
2018-02-19 13:05:57 -08:00
..
src Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork 2018-02-19 13:05:57 -08:00
CMakeLists.txt New android toolchain 2017-09-19 13:45:12 -07:00