Files
jami-daemon/daemon/test
Tristan Matthews bc787648c4 Merge branch 'master' into multichannel
Resolved Conflicts:
	daemon/src/audio/audioloop.cpp
	daemon/src/audio/audiortp/audio_rtp_record_handler.cpp
	daemon/src/audio/codecs/audiocodec.h
	daemon/src/audio/pulseaudio/pulselayer.cpp
2013-07-08 14:06:50 -04:00
..
2011-08-15 09:15:00 -04:00
2011-08-15 09:15:00 -04:00
2013-03-22 19:01:19 +11:00
2013-03-22 17:42:44 +11:00
2013-03-21 18:03:49 +11:00
2013-03-22 17:42:44 +11:00
2013-03-21 18:03:49 +11:00
2013-03-21 18:03:49 +11:00
2011-08-15 09:15:00 -04:00