# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1502277704 -7200
# Node ID eda8eb5611341ddd7e71c85dd16de27d939372af
# Parent  fb795bdaa06c2209de29ff649752568bea27876b# Parent  499b2dd69107356a8c05942e8128f11c9dfdf40d
branching: merge with stable

diff -r 499b2dd69107 -r eda8eb561134 hgext3rd/evolve/metadata.py
--- a/hgext3rd/evolve/metadata.py	Fri Sep 30 18:23:04 2016 +0200
+++ b/hgext3rd/evolve/metadata.py	Wed Aug 09 13:21:44 2017 +0200
@@ -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__ = '6.6.1.dev'
+__version__ = '6.7.0.dev'
 testedwith = '3.8.4 3.9.2 4.0.2 4.1.3 4.2.2'
 minimumhgversion = '3.8'
 buglink = 'https://bz.mercurial-scm.org/'
diff -r 499b2dd69107 -r eda8eb561134 hgext3rd/topic/__init__.py
--- a/hgext3rd/topic/__init__.py	Fri Sep 30 18:23:04 2016 +0200
+++ b/hgext3rd/topic/__init__.py	Wed Aug 09 13:21:44 2017 +0200
@@ -118,7 +118,7 @@
               'topic.active': 'green',
              }
 
-___version___ = '0.2.1.dev'
+__version__ = '0.3.0.dev'
 testedwith = '4.0.2 4.1.3 4.2.1'
 minimumhgversion = '4.0'
 buglink = 'https://bz.mercurial-scm.org/'