diff options
author | Sverker Eriksson <[email protected]> | 2018-02-13 12:36:06 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2018-02-13 12:36:06 +0100 |
commit | db7c5ee3c64a7039fe1efda939167ebb954c31bf (patch) | |
tree | 80b9804622ea431a71bdb85e44974211e66a7ac6 /erts/vsn.mk | |
parent | a7f6ce5e2d66f0f3425f38994e6f5256006c3984 (diff) | |
parent | dc0b345ae5374a422250c9d2e3bec63e6186afca (diff) | |
download | otp-db7c5ee3c64a7039fe1efda939167ebb954c31bf.tar.gz otp-db7c5ee3c64a7039fe1efda939167ebb954c31bf.tar.bz2 otp-db7c5ee3c64a7039fe1efda939167ebb954c31bf.zip |
Merge branch 'maint'
* maint:
Updated OTP version
Update release notes
Update version numbers
kernel: Add os:cmd/2 with max_size option
# Conflicts:
# OTP_VERSION
# lib/kernel/doc/src/os.xml
# lib/kernel/src/os.erl
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 8b22afea3b..50b77fdbc0 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 9.2 +VSN = 9.2.1 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |