aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2019-12-20 16:58:17 +1100
committerDamien George <damien.p.george@gmail.com>2019-12-20 16:58:17 +1100
commit1f371947309c5ea6023b6d9065415697cbc75578 (patch)
tree57906151737db68dc52b11b3870ffae68d30acb4
parent39bc430e44173430776e7336c9e622d52affe59a (diff)
all: Bump version to 1.12.v1.12
-rwxr-xr-xdocs/conf.py2
-rw-r--r--py/mpconfig.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/conf.py b/docs/conf.py
index dbd1d0c56..36f99cd2c 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -74,7 +74,7 @@ copyright = '2014-2019, Damien P. George, Paul Sokolovsky, and contributors'
#
# We don't follow "The short X.Y version" vs "The full version, including alpha/beta/rc tags"
# breakdown, so use the same version identifier for both to avoid confusion.
-version = release = '1.11'
+version = release = '1.12'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
diff --git a/py/mpconfig.h b/py/mpconfig.h
index e46da3e83..1e786f753 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -28,7 +28,7 @@
// Current version of MicroPython
#define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 11
+#define MICROPY_VERSION_MINOR 12
#define MICROPY_VERSION_MICRO 0
// Combined version as a 32-bit number for convenience