Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-09 01:18:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/assignment-client
History
Clement 6f52cf6ee9 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_smoothing 
Conflicts:
	interface/src/Audio.cpp
2014-12-29 09:48:38 -08:00
..
src Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_smoothing 2014-12-29 09:48:38 -08:00
CMakeLists.txt merging with upstream master and origin temp0 2014-12-22 10:38:11 -08:00