merged anarcat/osm_arbitrary_layers

[ikiwiki.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index da2cc73bbf9295e7c4df924debb4a33bf63cd308..5a6f7f437fc499a6de8a59bd121aef0026712cc0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,24 @@
-ikiwiki (3.20120517) UNRELEASED; urgency=low
+ikiwiki (3.20120630) UNRELEASED; urgency=low
+
+  * recentchangesdiff: When diffurl is not set, provide inline diffs
+    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
+  * osm: osm_layers can be used to configured the layers displayed on the map.
+    Thanks, Antoine Beaupré
+
+ -- Joey Hess <joeyh@debian.org>  Thu, 19 Jul 2012 13:46:52 -0400
+
+ikiwiki (3.20120629) unstable; urgency=low
 
   * mirrorlist: Add mirrorlist_use_cgi setting that avoids usedirs or
     other config differences by linking to the mirror's CGI. (intrigeri)
 
- -- Joey Hess <joeyh@debian.org>  Sun, 03 Jun 2012 13:15:22 -0400
+ -- Joey Hess <joeyh@debian.org>  Fri, 29 Jun 2012 10:16:08 -0400
 
 ikiwiki (3.20120516) unstable; urgency=high