diff options
| author | Rickard Green <[email protected]> | 2013-12-13 09:58:11 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2013-12-13 09:58:11 +0100 |
| commit | af17798534de376505498b86525ab8618753ebf7 (patch) | |
| tree | d8d9c88e3b211bedbb0abad1df8208b81904b998 /erts/vsn.mk | |
| parent | 458e302f61e2de36ebd49c5a5a5b984224bdce94 (diff) | |
| parent | 51918f4322b3d30c89ba9b6ca2fbfe5ad6c6b51b (diff) | |
| download | otp-af17798534de376505498b86525ab8618753ebf7.tar.gz otp-af17798534de376505498b86525ab8618753ebf7.tar.bz2 otp-af17798534de376505498b86525ab8618753ebf7.zip | |
Merge branch 'rickard/otp-17-vsn'
* rickard/otp-17-vsn:
Update versions of OTP, erts, kernel, and stdlib
Diffstat (limited to 'erts/vsn.mk')
| -rw-r--r-- | erts/vsn.mk | 4 |
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 |