restore tunnel submodule in submodules/, update linphone submodule, update exosip

This commit is contained in:
Simon Morlat 2012-01-31 13:42:33 +01:00
parent 50a32f5669
commit 68bb10b55e
5 changed files with 9 additions and 5 deletions

5
.gitmodules vendored
View file

@ -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

View file

@ -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:

@ -1 +1 @@
Subproject commit c3da0303519ad3120355cb85baee9cf6d0e4d1c2
Subproject commit 3f946ff6e7f50f75ffe3789b31fa29af10bfca13

@ -1 +1 @@
Subproject commit fdd53e63bce411157eba0f516f5f6acef9cb78b5
Subproject commit ffe1d65f344a7dd940bcf47b8148cd0d31242935

1
submodules/tunnel Submodule

@ -0,0 +1 @@
Subproject commit 31379dba112c6d6bafe0522bc72e907458eba1a7