summaryrefslogtreecommitdiff
path: root/.gitmodules
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-11 19:41:02 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-11 19:41:02 +0200
commit0c68033044413b4568edd5c6c0d92ff611ac3c61 (patch)
tree9e51bc987cce2b772a42c947f88cdd0f7fbf5a51 /.gitmodules
parentafcb44390d91076129252f188d7d29ddf846ac6b (diff)
parent231ffc619a287ec49921e99488bd9fbc733a3c3a (diff)
Merge branch 'master' into nonedit
Conflicts: Makefile (resolved manually)
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