Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-16 15:36:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/libraries/shared
History
Brad Hefta-Gaub d09afa9454 Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 
Conflicts:
	assignment-client/src/avatars/AvatarMixer.h
	assignment-client/src/avatars/AvatarMixerClientData.h
	libraries/avatars/src/AvatarData.cpp
	libraries/networking/src/udt/PacketHeaders.h
2016-12-20 16:25:12 -08:00
..
src Merge branch 'master' of https://github.com/highfidelity/hifi into addViewFrustumToAvatarMixer 2016-12-20 16:25:12 -08:00
CMakeLists.txt Add chrome tracing support 2016-12-16 01:14:01 -08:00