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

Merge branch 'master' into recording 

Conflicts:

	sflphone-gtk/src/sflnotify.c
	src/audio/audiortp.cpp
	src/sipvoiplink.cpp
parents 7dc9e7e2 af6915a2
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 773 additions and 5347 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment