Merge branch 'dev_sal'

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

Thu, 25 Mar 2010 20:20:14 +0000 (21:20 +0100)

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

Thu, 25 Mar 2010 20:20:14 +0000 (21:20 +0100)
author Simon Morlat <simon.morlat@linphone.org>
Thu, 25 Mar 2010 20:20:14 +0000 (21:20 +0100)
committer Simon Morlat <simon.morlat@linphone.org>
Thu, 25 Mar 2010 20:20:14 +0000 (21:20 +0100)
diff --cc console/commands.c
Simple merge
diff --cc console/linphonec.c
Simple merge
diff --cc coreapi/exevents.c
Simple merge
diff --cc coreapi/linphonecore.c
Simple merge
diff --cc coreapi/linphonecore.h
Simple merge
author	Simon Morlat <simon.morlat@linphone.org>
	Thu, 25 Mar 2010 20:20:14 +0000 (21:20 +0100)
committer	Simon Morlat <simon.morlat@linphone.org>
	Thu, 25 Mar 2010 20:20:14 +0000 (21:20 +0100)
		1	2
console/commands.c	patch \|	diff1 \|	diff2 \|	blob \| history
console/linphonec.c	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/exevents.c	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.c	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.h	patch \|	diff1 \|	diff2 \|	blob \| history