summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-11 19:47:38 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-11 19:47:38 +0200
commit3d0d7758d734490d162004909e0ede31e20a3c71 (patch)
tree0424bbacfabf86683b2475c7b953ddb3413fca74 /.gitmodules
parent35ee93258c78ba46bc06c54e87d1dd09f65e24f6 (diff)
parent3fcb77998ab10b85a76a7f538e87c61249785a88 (diff)
Merge branch '_nb' into nb
Conflicts: Makefile (manually resolved)
Diffstat (limited to '.gitmodules')
-rw-r--r--.gitmodules12
1 files changed, 12 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..4c34cde
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,12 @@
+[submodule "basewiki"]
+ path = basewiki
+ url = git://source.jones.dk/ikiwiki/basewiki
+[submodule "directives"]
+ path = directives
+ url = git://source.jones.dk/ikiwiki/directives
+[submodule "smiley"]
+ path = smiley
+ url = git://source.jones.dk/ikiwiki/smiley
+[submodule "templates"]
+ path = templates
+ url = git://source.jones.dk/ikiwiki/templates