Skip to content
Snippets Groups Projects
Commit 9315ff4a authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'call_duration' into release 

Conflicts:

	sflphone-gtk/src/Makefile.am
	sflphone-gtk/src/calltree.c
parents 4ae6fa48 af114d1b
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 1368 additions and 524 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