changeset 1804:e723a35599f3

merge with stable
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Wed, 01 Feb 2017 16:23:11 +0100
parents ed95f439843b (current diff) 54120614e9e5 (diff)
children 7b8195e22050
files
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Feb 01 16:17:09 2017 +0100
+++ b/.hgtags	Wed Feb 01 16:23:11 2017 +0100
@@ -43,3 +43,5 @@
 2ad40d972a740a613c4c559104166a015b37cac2 5.4.1
 727c7211c810d304ebf92b32db7ecf697ce46ac6 5.5.0
 99ede2d775458a236a46ad25a93aca473b676eee 5.6.0
+99ede2d775458a236a46ad25a93aca473b676eee 5.6.0
+e7b6e9c4a5d4317f56c2862910c569723b6ea71b 5.6.0
--- a/README	Wed Feb 01 16:17:09 2017 +0100
+++ b/README	Wed Feb 01 16:23:11 2017 +0100
@@ -56,7 +56,7 @@
 Changelog
 =========
 
-5.6.0 -- 2016-10-30
+5.6.0 -- 2017-02-01
 
  - compatibility with Mercurial 4.1.
  - improvement of prune error message.