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

author Guillaume Beraudo <guillaume.beraudo@linphone.org>

Wed, 23 Feb 2011 15:13:08 +0000 (16:13 +0100)

committer Guillaume Beraudo <guillaume.beraudo@linphone.org>

Wed, 23 Feb 2011 15:13:08 +0000 (16:13 +0100)
author Guillaume Beraudo <guillaume.beraudo@linphone.org>
Wed, 23 Feb 2011 15:13:08 +0000 (16:13 +0100)
committer Guillaume Beraudo <guillaume.beraudo@linphone.org>
Wed, 23 Feb 2011 15:13:08 +0000 (16:13 +0100)
diff --cc coreapi/linphonecore.c
Simple merge
diff --cc coreapi/linphonecore.h
Simple merge
diff --cc coreapi/linphonecore_jni.cc
Simple merge
diff --cc java/common/org/linphone/core/LinphoneCore.java
Simple merge
diff --cc java/common/org/linphone/core/LinphoneCoreFactory.java
Simple merge
author	Guillaume Beraudo <guillaume.beraudo@linphone.org>
	Wed, 23 Feb 2011 15:13:08 +0000 (16:13 +0100)
committer	Guillaume Beraudo <guillaume.beraudo@linphone.org>
	Wed, 23 Feb 2011 15:13:08 +0000 (16:13 +0100)
		1	2
coreapi/linphonecore.c	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore.h	patch \|	diff1 \|	diff2 \|	blob \| history
coreapi/linphonecore_jni.cc	patch \|	diff1 \|	diff2 \|	blob \| history
java/common/org/linphone/core/LinphoneCore.java	patch \|	diff1 \|	diff2 \|	blob \| history
java/common/org/linphone/core/LinphoneCoreFactory.java	patch \|	diff1 \|	diff2 \|	blob \| history