Merge pull request #1431 from natefoo/version-16.04.dev

Update version to 16.04.dev and handle the resulting merge conflict from release_16.01
This commit is contained in:
Martin Cech
2016-01-06 10:56:18 -05:00
+1 -1
View File
@@ -1,3 +1,3 @@
VERSION_MAJOR = "16.01"
VERSION_MAJOR = "16.04"
VERSION_MINOR = "dev"
VERSION = VERSION_MAJOR + ('.' + VERSION_MINOR if VERSION_MINOR else '')