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

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

Conflicts:

	src/sipcall.h
parents 88cb2f19 8ce5a055
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment