diff options
| author | John Högberg <[email protected]> | 2019-06-18 10:13:20 +0200 |
|---|---|---|
| committer | John Högberg <[email protected]> | 2019-06-18 10:13:20 +0200 |
| commit | 63dec44359b45e735a8328a84ecc1d3826ee82f1 (patch) | |
| tree | cade34322e2c6fbb6e4271409f0a8e29d05c8376 /erts/vsn.mk | |
| parent | a088080c66fb89ba5bd205cc4d7af85913d10c7d (diff) | |
| parent | e5b0b72d7213788ae6d4f01be14ba48ac463589d (diff) | |
| download | otp-63dec44359b45e735a8328a84ecc1d3826ee82f1.tar.gz otp-63dec44359b45e735a8328a84ecc1d3826ee82f1.tar.bz2 otp-63dec44359b45e735a8328a84ecc1d3826ee82f1.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
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 53dce5e815..40a9685e9d 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 10.4.2 +VSN = 10.4.3 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |