diff options
author | John Högberg <[email protected]> | 2019-07-03 10:31:58 +0200 |
---|---|---|
committer | John Högberg <[email protected]> | 2019-07-03 10:31:58 +0200 |
commit | b0a8268780f3f24cbfd9698a0ca08d166bbbd798 (patch) | |
tree | 671df9369e24377b40b80145f37564209e05d2d1 /erts/vsn.mk | |
parent | 9e49cf35723d7436dbd0ec2f3c8da165b6eb906a (diff) | |
parent | 7999631c63998cffc07bbcc91dd86cbe709dde5f (diff) | |
download | otp-b0a8268780f3f24cbfd9698a0ca08d166bbbd798.tar.gz otp-b0a8268780f3f24cbfd9698a0ca08d166bbbd798.tar.bz2 otp-b0a8268780f3f24cbfd9698a0ca08d166bbbd798.zip |
Merge branch 'maint-22' into maint
* maint-22:
Updated OTP version
Prepare release
# Conflicts:
# make/otp_version_tickets
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 40a9685e9d..f06fd08540 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 10.4.3 +VSN = 10.4.4 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |