From 68bb10b55e7b03db8feab9c6cddaaf08187c0fbd Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Tue, 31 Jan 2012 13:42:33 +0100 Subject: [PATCH] restore tunnel submodule in submodules/, update linphone submodule, update exosip --- .gitmodules | 5 ++++- submodules/build/builders.d/tunnel.mk | 4 ++-- submodules/externals/exosip | 2 +- submodules/linphone | 2 +- submodules/tunnel | 1 + 5 files changed, 9 insertions(+), 5 deletions(-) create mode 160000 submodules/tunnel diff --git a/.gitmodules b/.gitmodules index a2b1bdbe3..91ccd4cab 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,6 @@ [submodule "submodules/linphone"] path = submodules/linphone - url = gitosis@git.linphone.org:linphone-private.git + url = git://git.linphone.org/linphone.git [submodule "submodules/externals/osip"] path = submodules/externals/osip url = git://git.linphone.org/osip.git @@ -46,3 +46,6 @@ [submodule "submodules/externals/srtp"] path = submodules/externals/srtp url = git://git.linphone.org/srtp.git +[submodule "submodules/tunnel"] + path = submodules/tunnel + url = gitosis@git.linphone.org:tunnel diff --git a/submodules/build/builders.d/tunnel.mk b/submodules/build/builders.d/tunnel.mk index d9a4aeb64..4ba2a89b6 100644 --- a/submodules/build/builders.d/tunnel.mk +++ b/submodules/build/builders.d/tunnel.mk @@ -1,5 +1,5 @@ -TUNNEL_SRC_DIR?=$(BUILDER_SRC_DIR)/linphone/tunnel -TUNNEL_BUILD_DIR?=$(BUILDER_BUILD_DIR)/linphone/tunnel +TUNNEL_SRC_DIR?=$(BUILDER_SRC_DIR)/tunnel +TUNNEL_BUILD_DIR?=$(BUILDER_BUILD_DIR)/tunnel #############################TUNNEL############################ $(TUNNEL_SRC_DIR)/configure: diff --git a/submodules/externals/exosip b/submodules/externals/exosip index c3da03035..3f946ff6e 160000 --- a/submodules/externals/exosip +++ b/submodules/externals/exosip @@ -1 +1 @@ -Subproject commit c3da0303519ad3120355cb85baee9cf6d0e4d1c2 +Subproject commit 3f946ff6e7f50f75ffe3789b31fa29af10bfca13 diff --git a/submodules/linphone b/submodules/linphone index fdd53e63b..ffe1d65f3 160000 --- a/submodules/linphone +++ b/submodules/linphone @@ -1 +1 @@ -Subproject commit fdd53e63bce411157eba0f516f5f6acef9cb78b5 +Subproject commit ffe1d65f344a7dd940bcf47b8148cd0d31242935 diff --git a/submodules/tunnel b/submodules/tunnel new file mode 160000 index 000000000..31379dba1 --- /dev/null +++ b/submodules/tunnel @@ -0,0 +1 @@ +Subproject commit 31379dba112c6d6bafe0522bc72e907458eba1a7