diff options
author | Sverker Eriksson <[email protected]> | 2017-02-03 17:01:52 +0100 |
---|---|---|
committer | Sverker Eriksson <[email protected]> | 2017-02-03 17:01:52 +0100 |
commit | 69b928b12d9206d00879c08e46143f599f9dc34e (patch) | |
tree | fde8905a6ca71c797725a33895321c67e81c3645 /erts/vsn.mk | |
parent | 4b97d656a9e1774fd4ff984014f085ad661a4fdb (diff) | |
parent | 1923315e618bea9fb23fc3237541f95a0accc266 (diff) | |
download | otp-69b928b12d9206d00879c08e46143f599f9dc34e.tar.gz otp-69b928b12d9206d00879c08e46143f599f9dc34e.tar.bz2 otp-69b928b12d9206d00879c08e46143f599f9dc34e.zip |
Merge branch 'master' into sverker/enif_select
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 317d731cd7..028b114068 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 8.1.1 +VSN = 8.2.1 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |