Merge branch 'master' into dev

This commit is contained in:
Paulus Schoutsen 2016-12-18 15:02:02 -08:00
commit 4778ec4f94

View File

@ -3,6 +3,7 @@
MAJOR_VERSION = 0 MAJOR_VERSION = 0
MINOR_VERSION = 36 MINOR_VERSION = 36
PATCH_VERSION = '0.dev0' PATCH_VERSION = '0.dev0'
>>>>>>> master
__short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION) __short_version__ = '{}.{}'.format(MAJOR_VERSION, MINOR_VERSION)
__version__ = '{}.{}'.format(__short_version__, PATCH_VERSION) __version__ = '{}.{}'.format(__short_version__, PATCH_VERSION)
REQUIRED_PYTHON_VER = (3, 4, 2) REQUIRED_PYTHON_VER = (3, 4, 2)