overte/libraries/audio-client
Atlante45 e79e1a547f Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_smoothing
Conflicts:
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
2015-02-10 16:08:34 +01:00
..
external/gverb handle gverb move to audio-client 2015-01-29 12:44:03 -08:00
src Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_smoothing 2015-02-10 16:08:34 +01:00
CMakeLists.txt set size of GVRMainWindow to note 4 size 2015-01-29 10:11:46 -08:00