aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSverker Eriksson <[email protected]>2014-04-10 20:42:10 +0200
committerSverker Eriksson <[email protected]>2014-04-10 20:42:10 +0200
commitc118faa71ee507d32cfb3e7bcac58353045c79e8 (patch)
tree699b48cfd7d34ec0ca8087bafdca387d1e5e6259
parent07b8f441ca711f9812fad9e9115bab3c3aa92f79 (diff)
downloadotp-c118faa71ee507d32cfb3e7bcac58353045c79e8.tar.gz
otp-c118faa71ee507d32cfb3e7bcac58353045c79e8.tar.bz2
otp-c118faa71ee507d32cfb3e7bcac58353045c79e8.zip
Development versions
-rw-r--r--OTP_VERSION2
-rw-r--r--erts/vsn.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/OTP_VERSION b/OTP_VERSION
index 03b6389f32..1fbc0d2431 100644
--- a/OTP_VERSION
+++ b/OTP_VERSION
@@ -1 +1 @@
-17.0
+18.0-rc0
diff --git a/erts/vsn.mk b/erts/vsn.mk
index 081fb66398..ab98bd4a17 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -17,7 +17,7 @@
# %CopyrightEnd%
#
-VSN = 6.0
+VSN = 7.0
# Port number 4365 in 4.2
# Port number 4366 in 4.3