Commit 4c05365e authored by Pierre-Luc Beaudoin's avatar Pierre-Luc Beaudoin
Browse files

Merge commit 'origin/master'

Conflicts:

	sflphone-gtk/src/calltree.c
	sflphone-gtk/src/menus.c
	sflphone-gtk/src/sliders.c
parents e7f22da8 ef70b332
Supports Markdown
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