aboutsummaryrefslogtreecommitdiffstats
path: root/erts/vsn.mk
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2018-08-11 16:05:13 +0200
committerRickard Green <[email protected]>2018-08-11 16:05:13 +0200
commit503f6c802b2561881e0d4a62b32d7ee71575f319 (patch)
tree59d14d3d0ce39237093c3509b52ac506b355974c /erts/vsn.mk
parentce0c75c557bdc239622a6de5ec2edb593baf4773 (diff)
parente37eec271ad08a6689e358071eeb800674cde938 (diff)
downloadotp-503f6c802b2561881e0d4a62b32d7ee71575f319.tar.gz
otp-503f6c802b2561881e0d4a62b32d7ee71575f319.tar.bz2
otp-503f6c802b2561881e0d4a62b32d7ee71575f319.zip
Merge branch 'maint-21' into maint
* maint-21: Updated OTP version Update release notes Update version numbers
Diffstat (limited to 'erts/vsn.mk')
-rw-r--r--erts/vsn.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/erts/vsn.mk b/erts/vsn.mk
index ac464ea165..c0444fa483 100644
--- a/erts/vsn.mk
+++ b/erts/vsn.mk
@@ -18,7 +18,7 @@
# %CopyrightEnd%
#
-VSN = 10.0.4
+VSN = 10.0.5
# Port number 4365 in 4.2
# Port number 4366 in 4.3