diff options
author | Ingela Anderton Andin <[email protected]> | 2018-12-21 09:50:46 +0100 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2018-12-21 09:50:46 +0100 |
commit | 58dcd66ac638b1d6355662f0fb364001013769f4 (patch) | |
tree | b1dc4bc2cf2ce48004ed6d2c44033435a8e69ca2 /erts/vsn.mk | |
parent | 7759ef4247f0fa9bec765e1c90234a2333eda9d0 (diff) | |
parent | 5da29dab1d0de935b37cbfc9018d0d01955f1f48 (diff) | |
download | otp-58dcd66ac638b1d6355662f0fb364001013769f4.tar.gz otp-58dcd66ac638b1d6355662f0fb364001013769f4.tar.bz2 otp-58dcd66ac638b1d6355662f0fb364001013769f4.zip |
Merge branch 'maint-21' into maint
* maint-21:
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 |