Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-27 01:30:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/assignment-client
History
Brad Hefta-Gaub 3a0c63cbc7 Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements 
Conflicts:
	assignment-client/src/avatars/AvatarMixer.cpp
2017-02-16 18:14:52 -08:00
..
src Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements 2017-02-16 18:14:52 -08:00
CMakeLists.txt cmake fix 2016-09-06 17:40:44 -07:00