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

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

Thu, 14 Oct 2010 19:45:19 +0000 (21:45 +0200)

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

Thu, 14 Oct 2010 19:45:19 +0000 (21:45 +0200)
author Jehan Monnier <jehan.monnier@linphone.org>
Thu, 14 Oct 2010 19:45:19 +0000 (21:45 +0200)
committer Jehan Monnier <jehan.monnier@linphone.org>
Thu, 14 Oct 2010 19:45:19 +0000 (21:45 +0200)
diff --cc console/linphonec.c
Simple merge
diff --cc coreapi/friend.c
Simple merge
diff --cc coreapi/linphonecore.h
Simple merge
diff --cc coreapi/presence.c
Simple merge
diff --cc gtk/main.c
Simple merge
author	Jehan Monnier <jehan.monnier@linphone.org>
	Thu, 14 Oct 2010 19:45:19 +0000 (21:45 +0200)
committer	Jehan Monnier <jehan.monnier@linphone.org>
	Thu, 14 Oct 2010 19:45:19 +0000 (21:45 +0200)
		1	2
console/linphonec.c	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/friend.c	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.h	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/presence.c	patch \|	diff1 \|	diff2 \|	blob \| history
gtk/main.c	patch \|	diff1 \|	diff2 \|	blob \| history