diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:48:03 +0200 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2010-07-11 19:48:03 +0200 |
| commit | 97c2f00d8748f7cb2c0a3b82694ca6cab6531897 (patch) | |
| tree | 6b0a59544b02d6ba6cd50053c45577e4acdf2c0b /.gitmodules | |
| parent | 352aa426bf442df996be8e8763a6622f762b411a (diff) | |
| parent | c105645368dd025efc83b0dd9e68b7a64bf1f005 (diff) | |
Merge branch '_multilang' into multilang
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 |