Commit bc787648 authored 11 years ago by Tristan Matthews

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

parents 5b639fdf d8a325b7

No related branches found

No related tags found

No related merge requests found

Expand all Show whitespace changes

Inline Side-by-side

Showing with 66 additions and 3380 deletions

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment