changeset 2474:50113c1ea068

merge with stable
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 23 May 2017 10:50:56 +0200
parents 5d015dfd7753 (current diff) 971325f96108 (diff)
children 5bbc756adda4
files README hgext3rd/evolve/metadata.py
diffstat 3 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon May 22 16:01:59 2017 +0200
+++ b/.hgtags	Tue May 23 10:50:56 2017 +0200
@@ -50,3 +50,4 @@
 5ef112a6eb875633a7925cde61b7d2d9e65b3a56 6.0.1
 8510d3fd7c3b312dc731f4c29badc415d504558a 6.1.0
 d4ee0274a8efbaf3d73a659998248c379c61c2bf 6.2.0
+0af99106b0754426913b5c82fb52dc70d4d299f6 6.2.1
--- a/README	Mon May 22 16:01:59 2017 +0200
+++ b/README	Tue May 23 10:50:56 2017 +0200
@@ -117,7 +117,7 @@
 
  - olog: add an 'obslog' alias
 
-6.2.1 - in progress
+6.2.1 -- 2017-05-23
 -------------------
 
  - prune: fix a crash related to color handling,
--- a/debian/changelog	Mon May 22 16:01:59 2017 +0200
+++ b/debian/changelog	Tue May 23 10:50:56 2017 +0200
@@ -1,3 +1,9 @@
+mercurial-evolve (6.2.1-1) unstable; urgency=medium
+
+  * new upstream release
+
+ -- Pierre-Yves David <pierre-yves.david@ens-lyon.org>  Tue, 23 May 2017 10:47:36 +0200
+
 mercurial-evolve (6.2.0-1) unstable; urgency=medium
 
   * new upstream release