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

Merge branch 'master' into fix_threads

Resolved Conflicts:
	sflphone-common/src/audio/algorithm.h
	sflphone-common/src/audio/audiortp/AudioRtpRecordHandler.cpp
parents 1ecff75e 7cf8ce36
No related branches found
No related tags found
No related merge requests found
Showing
with 71 additions and 259 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment