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

autogen.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-AM_VERSION="1.10"
+#AM_VERSION="1.10"
 if ! type aclocal-$AM_VERSION 1>/dev/null 2>&1; then
 	# automake-1.10 (recommended) is not available on Fedora 8
 	AUTOMAKE=automake

java/org/linphone/core/LinphoneProxyConfig.java

@@ -68,4 +68,8 @@ public interface LinphoneProxyConfig {
 	 * @return may be null
 	 */
 	public String getDomain();
+	public String getIdentity();
+	public String getProxy();
+	public boolean registerEnabled();
+	public boolean isRegistered();
 }

mediastreamer2

@@ -1 +1 @@
-Subproject commit a4d247cb5e8fc2cf04e615d5a7b90251d349b7a8
+Subproject commit 166db20a49a308e161d7b5c74fdc5aff000db9a2

oRTP

@@ -1 +1 @@
-Subproject commit 6600413b76e49b33976ea4459e5ceffe345655d6
+Subproject commit 92c452dcd38b26a0ce41d10be9a32d37f72a7d27