Skip to content
Snippets Groups Projects
Commit 18079197 authored by areversat's avatar areversat
Browse files

Merge branch 'release' of ssh://toine@192.168.1.216/home-local/emilou/sflphone into release 

Conflicts:

	sflphone-gtk/src/Makefile.am
	sflphone-gtk/src/calllist.h
	sflphone-gtk/src/calltree.h
	sflphone-gtk/src/menus.c
parents 09031a76 76653f79
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 238 additions and 173 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