diff options
author | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:46:25 +0200 |
---|---|---|
committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:46:25 +0200 |
commit | 0a184c16c927ad613935c28322d7eb33b18aedc9 (patch) | |
tree | 8c5091c9872174f29b123e788fdbf50f62bf2d97 /.gitmodules | |
parent | a4d3a0fc6319df9acf57b8df12f5f0054fd3b074 (diff) | |
parent | 1c38e0cb52a622d7ebd6ef2f45d95efcb37e878c (diff) |
Merge branch '_scs' into scs
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 |