summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2012-08-04 15:46:04 +0200
committerJonas Smedegaard <dr@jones.dk>2012-08-04 15:46:04 +0200
commitf883dcfd58c1b6811d341c22e553ebc7f53b9aa5 (patch)
tree055cef88e581a1a4dd94d454ca3a964924418300
parent289e0e2c2ba90e690dc8ce9c1558ca0b9cf679d7 (diff)
Sync with HEAD of submodules, and add new submodule osm.
-rw-r--r--.gitmodules3
m---------attachment0
m---------basewiki0
m---------directives0
m---------javascript0
m---------openid-selector0
m---------osm0
m---------perl0
m---------templates0
m---------themes0
10 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 526a65f..884df93 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -28,3 +28,6 @@
[submodule "jquery"]
path = jquery
url = git://source.jones.dk/ikiwiki/jquery
+[submodule "osm"]
+ path = osm
+ url = git://source.jones.dk/ikiwiki/osm
diff --git a/attachment b/attachment
-Subproject 101beb116501b49d69c158413037601ae4f2203
+Subproject f31bfdf3ace0020f10d6157c1e3b1a89365c434
diff --git a/basewiki b/basewiki
-Subproject 400f837c143e03ab7b183fb26070d0b72fbc23d
+Subproject a46ebd14e13dd1f42d446d0eda7ee7a98a6781e
diff --git a/directives b/directives
-Subproject 310150aea29904bc6a929ddcfbc191362ec1971
+Subproject 0686e55e2a02a8e50cac8ac21a51d938a4cb078
diff --git a/javascript b/javascript
-Subproject 80e48d9d608fc8426fe23f3f1a300a662c94449
+Subproject 45f99afe7c1ffb2429741eb214ad4fa6f40062c
diff --git a/openid-selector b/openid-selector
-Subproject 9a4dc5c570327a0504d3dc62fd27aee06ea13dd
+Subproject cfee2a1e2966a3d75e6079b899c29a8cca33d2d
diff --git a/osm b/osm
new file mode 160000
+Subproject c4dbd05e1305f0c021a56495dc28c604362a6ce
diff --git a/perl b/perl
-Subproject 0c71a177cbe4594025f6dfc8ae6daf3f7ff1965
+Subproject e857ff5315b319074dd2e4df7b3e70f2a360571
diff --git a/templates b/templates
-Subproject bde35ace94b9cc6ef00fcd20b359dc17f0caa46
+Subproject 8ef09078369a28fa6f74153ef742e90da67d400
diff --git a/themes b/themes
-Subproject e858a96161d13dcaf0d622a50ba1e0d13106f78
+Subproject c656f05be249eca9ccb4b927d98e3295fe3fa01