Merge branch 'master' into fix/TVTKPolyDataWriter

oesteban · oesteban · commit da894b08aad5 · 2015-09-18T12:51:34.000+02:00
Conflicts:
	CHANGES
diff --git a/CHANGES b/CHANGES
@@ -3,6 +3,7 @@ Next release
 
 * FIX: VTK version check missing when using tvtk (https://github.com/nipy/nipype/pull/1219)
 
+
 Release 0.11.0 (September 15, 2015)
 ============
 
diff --git a/nipype/info.py b/nipype/info.py
@@ -8,9 +8,9 @@
 # full release.  '.dev' as a _version_extra string means this is a development
 # version
 _version_major = 0
-_version_minor = 11
+_version_minor = 12
 _version_micro = 0
-_version_extra = '' # switch to -dev for non release
+_version_extra = '-dev'  # Remove -dev for release
 
 def get_nipype_gitversion():
     """Nipype version as reported by the last commit in git
