diff options
author | Henrik Nord <[email protected]> | 2016-09-14 15:22:52 +0200 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2016-09-14 15:22:52 +0200 |
commit | 98b870f624753427b606f911fff255ff8864aa2e (patch) | |
tree | ae633a4d17c5ef69cae4e39c67eeadc23b1a21f1 /erts/vsn.mk | |
parent | f1ab784289830d0ea1d089f29364fbc56515f05b (diff) | |
parent | 33b39b559a31c38465dfc038218f432c9c60a9ad (diff) | |
download | otp-98b870f624753427b606f911fff255ff8864aa2e.tar.gz otp-98b870f624753427b606f911fff255ff8864aa2e.tar.bz2 otp-98b870f624753427b606f911fff255ff8864aa2e.zip |
Merge branch 'maint-19' into maint
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 d9c441e887..95d0e7b08d 100644 --- a/erts/vsn.mk +++ b/erts/vsn.mk @@ -18,7 +18,7 @@ # %CopyrightEnd% # -VSN = 8.0.4 +VSN = 8.0.5 # Port number 4365 in 4.2 # Port number 4366 in 4.3 |