merge from tunnel branch

This commit is contained in:
Simon Morlat 2012-01-30 23:50:28 +01:00
parent 5e0c3388e1
commit 805e041a9a

3
.gitmodules vendored
View file

@ -4,6 +4,3 @@
[submodule "mediastreamer2"]
path = mediastreamer2
url = git://git.linphone.org/mediastreamer2.git
[submodule "tunnel"]
path = tunnel
url = gitosis@git.linphone.org:tunnel.git