aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien George <damien@micropython.org>2021-04-19 00:11:51 +1000
committerDamien George <damien@micropython.org>2021-04-19 00:11:51 +1000
commit321d1897c34f16243edf2c94913d7cf877a013d1 (patch)
treec72f1df62bd5b2fc0b2f228b31ec85bea492d1f9
parent7d911d20698b3b11269f34ecec97d3b4bfabac94 (diff)
all: Bump version to 1.15.v1.15
Signed-off-by: Damien George <damien@micropython.org>
-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 dd6cc31fb..53cbf9bae 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -74,7 +74,7 @@ copyright = '2014-2021, 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.14'
+version = release = '1.15'
# 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 b26fa2137..3dd83a34a 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 14
+#define MICROPY_VERSION_MINOR 15
#define MICROPY_VERSION_MICRO 0
// Combined version as a 32-bit number for convenience