aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien George <damien.p.george@gmail.com>2019-01-26 00:56:48 +1100
committerDamien George <damien.p.george@gmail.com>2019-01-26 00:56:48 +1100
commit3e25d611ef3185b68558a20057d50b0d18dc67a0 (patch)
treef9fdc5d7192d480d8e1c21c77eb1154504e581d5
parentaba83e66d7d405d64e5788537eade62329f70929 (diff)
all: Bump version to 1.10.v1.10
-rwxr-xr-xdocs/conf.py4
-rw-r--r--py/mpconfig.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/conf.py b/docs/conf.py
index cd1f06518..61c660aa6 100755
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -66,7 +66,7 @@ master_doc = 'index'
# General information about the project.
project = 'MicroPython'
-copyright = '2014-2018, Damien P. George, Paul Sokolovsky, and contributors'
+copyright = '2014-2019, Damien P. George, Paul Sokolovsky, and contributors'
# The version info for the project you're documenting, acts as replacement for
# |version| and |release|, also used in various other places throughout the
@@ -74,7 +74,7 @@ copyright = '2014-2018, 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.9.4'
+version = release = '1.10'
# 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 53f1125bc..ce1a8cbfc 100644
--- a/py/mpconfig.h
+++ b/py/mpconfig.h
@@ -28,8 +28,8 @@
// Current version of MicroPython
#define MICROPY_VERSION_MAJOR 1
-#define MICROPY_VERSION_MINOR 9
-#define MICROPY_VERSION_MICRO 4
+#define MICROPY_VERSION_MINOR 10
+#define MICROPY_VERSION_MICRO 0
// Combined version as a 32-bit number for convenience
#define MICROPY_VERSION ( \