Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-10 05:23:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/libraries/audio-client
History
Atlante45 4ef87b9919 Merge branch 'master' of https://github.com/highfidelity/hifi into android 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/Stats.cpp
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
2015-01-28 13:13:32 -08:00
..
external/gverb intial removal of Audio to audio-client 2015-01-21 11:49:06 -08:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into android 2015-01-28 13:13:32 -08:00
CMakeLists.txt look for soxr and not redundant libsoxr 2015-01-22 14:09:29 -08:00