aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2012-08-05 22:02:39 -0400
committerJoey Hess <joey@kitenet.net>2012-08-05 22:02:39 -0400
commitd926c4aca9679cf2f259bd8bb0ee678eed43e30d (patch)
tree188ce16f3b49af71aaa6fe6d1d4a65821c85e893 /debian
parent409c4e48f983d10aceb6321148d7f440d17eb28f (diff)
downloadikiwiki-d926c4aca9679cf2f259bd8bb0ee678eed43e30d.tar
ikiwiki-d926c4aca9679cf2f259bd8bb0ee678eed43e30d.tar.gz
merged anarcat's osm fixes
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
1 files changed, 4 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index a77c42e42..bf4ff9db1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ ikiwiki (3.20120630) UNRELEASED; urgency=low
in the recentchanges page, with visibility toggleable via javascript.
Thanks, Antoine Beaupré
* Split CFLAGS into words when building wrapper. Closes: #682237
+ * osm: Avoid calling urlto before generated files are registered.
+ Thanks, Philippe Gauthier and Antoine Beaupré
+ * osm: Add osm_openlayers_url configuration setting.
+ Thanks, Genevieve
-- Joey Hess <joeyh@debian.org> Thu, 19 Jul 2012 13:46:52 -0400