Merge branch 'dev_sal' of belledonne-communications.com:linphone-private into dev_sal

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

Fri, 12 Mar 2010 17:50:50 +0000 (18:50 +0100)

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

Fri, 12 Mar 2010 17:50:50 +0000 (18:50 +0100)
author Simon Morlat <simon.morlat@linphone.org>
Fri, 12 Mar 2010 17:50:50 +0000 (18:50 +0100)
committer Simon Morlat <simon.morlat@linphone.org>
Fri, 12 Mar 2010 17:50:50 +0000 (18:50 +0100)
diff --cc coreapi/callbacks.c
Simple merge
diff --cc coreapi/linphonecore.c
Simple merge
diff --cc coreapi/private.h
Simple merge
author	Simon Morlat <simon.morlat@linphone.org>
	Fri, 12 Mar 2010 17:50:50 +0000 (18:50 +0100)
committer	Simon Morlat <simon.morlat@linphone.org>
	Fri, 12 Mar 2010 17:50:50 +0000 (18:50 +0100)
		1	2
coreapi/callbacks.c	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.c	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/private.h	patch \|	diff1 \|	diff2 \|	blob \| history