aboutsummaryrefslogtreecommitdiffstats
path: root/erts/vsn.mk
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2013-12-10 09:52:50 +0100
committerRickard Green <[email protected]>2013-12-10 12:27:15 +0100
commit51918f4322b3d30c89ba9b6ca2fbfe5ad6c6b51b (patch)
tree4173e9a8ed6c3e97327c75ec6d432439abf81abd /erts/vsn.mk
parent6d22d78204ca8bc8ed4beb92f6021ff3ba93a882 (diff)
downloadotp-51918f4322b3d30c89ba9b6ca2fbfe5ad6c6b51b.tar.gz
otp-51918f4322b3d30c89ba9b6ca2fbfe5ad6c6b51b.tar.bz2
otp-51918f4322b3d30c89ba9b6ca2fbfe5ad6c6b51b.zip
Update versions of OTP, erts, kernel, and stdlib
Update versions of OTP, erts, kernel, and stdlib to comply with the new version scheme decided by the OTP technical board.
Diffstat (limited to 'erts/vsn.mk')
-rw-r--r--erts/vsn.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 8baf169d6f..30aa870144 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -17,8 +17,8 @@
# %CopyrightEnd%
#
-VSN = 5.11
-SYSTEM_VSN = R17A
+VSN = 6.0
+SYSTEM_VSN = 17.0-rc0
# Port number 4365 in 4.2
# Port number 4366 in 4.3