overte/assignment-client
Atlante45 b59aaf8a0f 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-16 16:14:49 +01:00
..
src Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_smoothing 2015-02-16 16:14:49 +01:00
CMakeLists.txt more voxelEctomy 2014-12-30 19:58:04 -08:00