Commit graph

2 commits

Author SHA1 Message Date
Yann Diorcet
0408e3eae8 Merge branch 'master' into bellesip
Conflicts:
	.gitmodules
	Makefile
	submodules/externals/build/exosip/Android.mk
	submodules/externals/exosip
	submodules/linphone
2013-02-06 12:22:28 +01:00
Yann Diorcet
ef3a884311 Replace eXosip/osip by belle-sip
add a checktools utility
Add belle-sip
Add antlr3c
2013-01-23 14:08:55 +01:00