Merge branch 'master' of ssh://git.ikiwiki.info

[git.ikiwiki.info.git] / debian / changelog

diff --git a/debian/changelog b/debian/changelog
index afe3bb57837273bd9097c8db91739612118a0ea6..b8a74935fbaf3ab01aa3614aec8434578596c6f5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,17 @@ ikiwiki (3.20141017) UNRELEASED; urgency=medium
   * style.css, actiontabs, blueview, goldtype, monochrome: adjust layout
     below 600px ("responsive layout") so that horizontal scrolling is not
     needed on smartphone browsers or other small viewports.
+  * core: new libdirs option alongside libdir. Thanks, Louis Paternault
+
+  [ Amitai Schlair ]
+  * core: log a debug message before waiting for the lock.
+    Thanks, Mark Jason Dominus
+  * build: in po/Makefile, use the same $(MAKE) as the rest of the build.
+    Thanks, ttw
+
+  [ Joey Hess ]
+  * po: If msgmerge falls over on a problem po file, print a warning
+    message, but don't let this problem crash ikiwiki entirely.
 
  -- Joey Hess <joeyh@debian.org>  Mon, 20 Oct 2014 12:04:49 -0400