Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone

author Guillaume Beraudo <guillaume.beraudo@linphone.org>

Wed, 30 Mar 2011 07:32:15 +0000 (09:32 +0200)

committer Guillaume Beraudo <guillaume.beraudo@linphone.org>

Wed, 30 Mar 2011 07:32:15 +0000 (09:32 +0200)
author Guillaume Beraudo <guillaume.beraudo@linphone.org>
Wed, 30 Mar 2011 07:32:15 +0000 (09:32 +0200)
committer Guillaume Beraudo <guillaume.beraudo@linphone.org>
Wed, 30 Mar 2011 07:32:15 +0000 (09:32 +0200)
diff --cc coreapi/linphonecall.c
Simple merge
diff --cc coreapi/linphonecore.c
Simple merge
diff --cc coreapi/linphonecore.h
Simple merge
diff --cc coreapi/sal_eXosip2.c
Simple merge
author	Guillaume Beraudo <guillaume.beraudo@linphone.org>
	Wed, 30 Mar 2011 07:32:15 +0000 (09:32 +0200)
committer	Guillaume Beraudo <guillaume.beraudo@linphone.org>
	Wed, 30 Mar 2011 07:32:15 +0000 (09:32 +0200)
		1	2
coreapi/linphonecall.c	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.c	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.h	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/sal_eXosip2.c	patch \|	diff1 \|	diff2 \|	blob \| history