branching: merge stable into default
authorPierre-Yves David <pierre-yves.david@octobus.net>
Tue, 07 Nov 2017 13:04:58 +0100
changeset 3175 00b003ebb873
parent 3170 007e4d294ebe (diff)
parent 3174 d56b8f5f0bb1 (current diff)
child 3180 85ab7d2d9fd6
branching: merge stable into default
--- a/hgext3rd/evolve/metadata.py	Tue Nov 07 12:57:43 2017 +0100
+++ b/hgext3rd/evolve/metadata.py	Tue Nov 07 13:04:58 2017 +0100
@@ -5,7 +5,7 @@
 # This software may be used and distributed according to the terms of the
 # GNU General Public License version 2 or any later version.
 
-__version__ = '7.0.1.dev'
+__version__ = '7.1.0.dev'
 testedwith = '4.1.3 4.2.3 4.3.2 4.4'
 minimumhgversion = '4.1'
 buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py	Tue Nov 07 12:57:43 2017 +0100
+++ b/hgext3rd/topic/__init__.py	Tue Nov 07 13:04:58 2017 +0100
@@ -174,7 +174,7 @@
               'topic.active': 'green',
              }
 
-__version__ = '0.5.1.dev'
+__version__ = '0.6.0.dev'
 
 testedwith = '4.1.3 4.2.3 4.3.3 4.4'
 minimumhgversion = '4.1'