Merge pull request #44 from enthought/release/0.2

Bump versions and CHANGES
enthought · Apr 4, 2016 · a7a3ed5 · a7a3ed5
2 parents 85d3791 + fc07af2
commit a7a3ed5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,6 +1,14 @@
 Traits CHANGELOG
 ================
 
+Release 0.2
+-----------
+
+Features
+
+* Insert Binders into UIFile in addition to mere overrides (#42)
+
+
 Release 0.1.2
 -------------
 

diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -60,9 +60,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.1.2'
+version = '0.2'
 # The full version, including alpha/beta/rc tags.
-release = '0.1.2'
+release = '0.2'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 setup(
     name='qt_binder',
-    version='0.1.2',
+    version='0.2',
     author='Enthought, Inc.',
     author_email='info@enthought.com',
     description='Traits bindings for Qt',