Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

author Simon Morlat <simon.morlat@linphone.org>

Sat, 25 Sep 2010 14:38:51 +0000 (16:38 +0200)

committer Simon Morlat <simon.morlat@linphone.org>

Sat, 25 Sep 2010 14:38:51 +0000 (16:38 +0200)
author Simon Morlat <simon.morlat@linphone.org>
Sat, 25 Sep 2010 14:38:51 +0000 (16:38 +0200)
committer Simon Morlat <simon.morlat@linphone.org>
Sat, 25 Sep 2010 14:38:51 +0000 (16:38 +0200)
diff --cc coreapi/callbacks.c
Simple merge
diff --cc coreapi/private.h
Simple merge
author	Simon Morlat <simon.morlat@linphone.org>
	Sat, 25 Sep 2010 14:38:51 +0000 (16:38 +0200)
committer	Simon Morlat <simon.morlat@linphone.org>
	Sat, 25 Sep 2010 14:38:51 +0000 (16:38 +0200)
		1	2
coreapi/callbacks.c	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/private.h	patch \|	diff1 \|	diff2 \|	blob \| history