# HG changeset patch # User Pierre-Yves David # Date 1510056298 -3600 # Node ID 00b003ebb8739c8c588efc9176b6860e7b29219e # Parent 007e4d294ebe0215b8232cc7ff01717191d5c587# Parent d56b8f5f0bb18b86928a0d205bea257cd105c161 branching: merge stable into default diff -r d56b8f5f0bb1 -r 00b003ebb873 hgext3rd/evolve/metadata.py --- 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/' diff -r d56b8f5f0bb1 -r 00b003ebb873 hgext3rd/topic/__init__.py --- 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'