diff options
author | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:47:02 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:47:02 +0200 |
commit | c4e8008965cfa559d3884e3f8efff96fb54a2477 (patch) | |
tree | 7489b7d842a3b680c9ff84a429f69e7f62a431e5 /.gitmodules | |
parent | bc2b44033c71ca7f5af9c83cb08c82097878e216 (diff) | |
parent | cc664f282400169a489e901e06ee87a32599d0d0 (diff) |
Merge branch '_da' into da
Conflicts:
Makefile (manually resolved)
Diffstat (limited to '.gitmodules')
-rw-r--r-- | .gitmodules | 12 |
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 |