summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2008-12-25 16:36:16 -0500
committerJoey Hess <joey@gnu.kitenet.net>2008-12-25 16:36:16 -0500
commit914c839ceb02fdbb36a49aa6548dc95beaf59ea4 (patch)
tree3437581c097a77ed839a13ef71e65a4d05cc415e /debian/changelog
parent5f55ee0b783fb0a7b3b1dcb63ff280bad25af364 (diff)
parent0d406010ff8ffb8d891318bbaf6b6de1e2cb2578 (diff)
Merge branch 'master' into next
Conflicts: IkiWiki/Plugin/googlecalendar.pm
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index ff1c6aa5f..62ff1ba6f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ ikiwiki (2.72) unstable; urgency=low
* Avoid comments in recentchanges being broken links (smcv)
* Add deprecation warning for GlobLists, which will stop working in 3.0.
+ * camelcase: Add camelcase_ignore setting.
+ * googlecalendar: Add runtime deprecation warning.
-- Joey Hess <joeyh@debian.org> Wed, 24 Dec 2008 19:49:32 -0500