Merge branch 'master' of git.linphone.org:linphone

author Jehan Monnier <jehan.monnier@linphone.org>

Tue, 2 Oct 2012 13:30:50 +0000 (15:30 +0200)

committer Jehan Monnier <jehan.monnier@linphone.org>

Tue, 2 Oct 2012 13:30:50 +0000 (15:30 +0200)
author Jehan Monnier <jehan.monnier@linphone.org>
Tue, 2 Oct 2012 13:30:50 +0000 (15:30 +0200)
committer Jehan Monnier <jehan.monnier@linphone.org>
Tue, 2 Oct 2012 13:30:50 +0000 (15:30 +0200)
diff --cc coreapi/linphonecall.c
Simple merge
diff --cc coreapi/linphonecore.c
Simple merge
diff --cc coreapi/linphonecore.h
Simple merge
author	Jehan Monnier <jehan.monnier@linphone.org>
	Tue, 2 Oct 2012 13:30:50 +0000 (15:30 +0200)
committer	Jehan Monnier <jehan.monnier@linphone.org>
	Tue, 2 Oct 2012 13:30:50 +0000 (15:30 +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