]> git.meshlink.io Git - meshlink/commitdiff
submodule catta added
authorNiklas Hofmann <niklas.hofmann@everbase.net>
Fri, 15 Aug 2014 10:10:30 +0000 (12:10 +0200)
committerGuus Sliepen <guus@meshlink.io>
Sat, 27 Dec 2014 16:58:49 +0000 (17:58 +0100)
Conflicts:
.gitmodules

.gitmodules
catta [new submodule]

index e938b09181fe4913bb679de84d167cd8917664c7..ed17334b9d6be61c40999595d6d2d74383e86bdc 100644 (file)
@@ -2,6 +2,10 @@
        path = avahi
        url = git@chicago.everbase.net:meshlink/avahi-noptr.git
        branch = noptr
+[submodule "catta"]
+       path = catta
+       url = https://github.com/everbase/catta.git
+       branch = develop
 [submodule "src/utcp"]
        path = src/utcp
        url = git://meshlink.io/utcp
diff --git a/catta b/catta
new file mode 160000 (submodule)
index 0000000..7a5b2f6
--- /dev/null
+++ b/catta
@@ -0,0 +1 @@
+Subproject commit 7a5b2f69af7d36d6cd4153142f125fa011784e03