Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 14:59:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/assignment-client
History
Brad Hefta-Gaub acca9dbe87 Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 
Conflicts:
	libraries/networking/src/udt/PacketHeaders.cpp
	libraries/networking/src/udt/PacketHeaders.h
2017-01-04 18:07:22 -08:00
..
src Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo 2017-01-04 18:07:22 -08:00
CMakeLists.txt cmake fix 2016-09-06 17:40:44 -07:00