diff options
author | Ingela Anderton Andin <[email protected]> | 2018-12-21 09:56:11 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2018-12-21 09:56:11 +0100 |
commit | f15f8ed428e46b8e40ab07853d4e5ff53deff7d2 (patch) | |
tree | f6d2c629807749584497416e3fccae50aa029597 /erts/vsn.mk | |
parent | 04c70cafd0ba107e7644462bebcc2db05cc996e4 (diff) | |
parent | 58dcd66ac638b1d6355662f0fb364001013769f4 (diff) | |
download | otp-f15f8ed428e46b8e40ab07853d4e5ff53deff7d2.tar.gz otp-f15f8ed428e46b8e40ab07853d4e5ff53deff7d2.tar.bz2 otp-f15f8ed428e46b8e40ab07853d4e5ff53deff7d2.zip |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
Diffstat (limited to 'erts/vsn.mk')
-rw-r--r-- | erts/vsn.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/vsn.mk b/erts/vsn.mk index 0adee946cc..73199cc721 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 10.2 +VSN = 10.2.1 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |