aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-07-19 11:26:14 -0400
committerJoey Hess <joey@kitenet.net>2011-07-19 11:26:14 -0400
commit86e1dc492ffa26f6546c9c6d3234b762a86ccb61 (patch)
tree9cb9d3eddd875bd1abe3fbc7c1e3defd80be3d22 /debian
parent91e5375e6e9e1b56d9240e228d033cd90002fc8e (diff)
downloadikiwiki-86e1dc492ffa26f6546c9c6d3234b762a86ccb61.tar
ikiwiki-86e1dc492ffa26f6546c9c6d3234b762a86ccb61.tar.gz
apply the big mercurial patch
* mercurial: openid nicknames are now used when committing. (Daniel Andersson) * mercurial: implement rcs_commit_staged so comments, attachments, etc can be used. (Daniel Andersson) * mercurial: fix viewing of a diff containing non-utf8 changes. (Daniel Andersson)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog10
1 files changed, 10 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 8e280f9c7..30084304a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ikiwiki (3.20110716) UNRELEASED; urgency=low
+
+ * mercurial: openid nicknames are now used when committing. (Daniel Andersson)
+ * mercurial: implement rcs_commit_staged so comments, attachments, etc
+ can be used. (Daniel Andersson)
+ * mercurial: fix viewing of a diff containing non-utf8 changes.
+ (Daniel Andersson)
+
+ -- Joey Hess <joeyh@debian.org> Tue, 19 Jul 2011 11:22:52 -0400
+
ikiwiki (3.20110715) unstable; urgency=low
* rename: Fix logic error that broke renaming pages when the attachment