# HG changeset patch # User Pierre-Yves David # Date 1516803629 -3600 # Node ID 4a1dc485464841adb4508703109209296d3a2af7 # Parent b0ca70e733bfc09b6920e56c2a7d06da818d6210# Parent 8ea3eccba74612f3b4b707fccea5692d9bf0b1c3 branching: merge stable back into default diff -r 8ea3eccba746 -r 4a1dc4854648 hgext3rd/evolve/metadata.py --- a/hgext3rd/evolve/metadata.py Wed Jan 24 15:19:17 2018 +0100 +++ b/hgext3rd/evolve/metadata.py Wed Jan 24 15:20:29 2018 +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.2.2.dev' +__version__ = '7.3.0.dev' testedwith = '4.1.3 4.2.3 4.3.2 4.4.2' minimumhgversion = '4.1' buglink = 'https://bz.mercurial-scm.org/' diff -r 8ea3eccba746 -r 4a1dc4854648 hgext3rd/topic/__init__.py --- a/hgext3rd/topic/__init__.py Wed Jan 24 15:19:17 2018 +0100 +++ b/hgext3rd/topic/__init__.py Wed Jan 24 15:20:29 2018 +0100 @@ -175,7 +175,7 @@ 'topic.active': 'green', } -__version__ = '0.7.1.dev' +__version__ = '0.8.0.dev' testedwith = '4.1.3 4.2.3 4.3.3 4.4.2' minimumhgversion = '4.1'