Commit 805e041a authored by Simon Morlat's avatar Simon Morlat
Browse files

merge from tunnel branch

parent 5e0c3388
......@@ -4,6 +4,3 @@
[submodule "mediastreamer2"]
path = mediastreamer2
url = git://
[submodule "tunnel"]
path = tunnel
url =
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment