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

Merge branch 'yun-pjsip' of ssh://milou@192.168.1.203/home/yun/release/sflphone into sip_dev 

Conflicts:

	configure.ac
	src/useragent.cpp
parents 88977b45 2e307afd
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
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