Skip to content
Snippets Groups Projects
Commit 69e13254 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

Merge branch 'm_savard' into echocancel

Conflicts:
	sflphone-common/src/audio/alsa/alsalayer.cpp
parents 9e76a5d6 2345dd70
No related branches found
No related tags found
No related merge requests found
Showing
with 136 additions and 180 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment