Skip to content
Snippets Groups Projects
Commit bc787648 authored by Tristan Matthews's avatar Tristan Matthews
Browse files

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
Loading
Showing
with 66 additions and 3380 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment