Skip to content
Snippets Groups Projects
Commit 9858b9a9 authored by Yun Liu's avatar Yun Liu
Browse files

Merge branch 'sip_dev' of ssh://yun@192.168.1.16/home-local/manu/dev/sfl/sflphone into yun-pjsip 

Conflicts:

	libs/dbus-c++/autom4te.cache/requests
	libs/dbus-c++/config.log
	libs/dbus-c++/config.status
parents 84023912 4da51a52
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 263 additions and 2448 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