aboutsummaryrefslogtreecommitdiffstats
path: root/lib/compiler/vsn.mk
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2018-10-12 17:59:18 +0200
committerRickard Green <[email protected]>2018-10-12 17:59:18 +0200
commit8e65d31faab67b9844bbbaaa6245b2da2dd97b76 (patch)
treefec253c9db3c1d24b77f3f4933b8361ef740266b /lib/compiler/vsn.mk
parente620c8c507c33ebca6216d71a8de73bce2722ac2 (diff)
parent13baa4384c4c9c49e6d540bc8ae6b8946f2454ed (diff)
downloadotp-8e65d31faab67b9844bbbaaa6245b2da2dd97b76.tar.gz
otp-8e65d31faab67b9844bbbaaa6245b2da2dd97b76.tar.bz2
otp-8e65d31faab67b9844bbbaaa6245b2da2dd97b76.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release erts: Fix UNC path handling on Windows erts: Fix a compiler warning eldap: Fix race at socket close Fix bug for sockopt pktoptions on BSD erts: Fix memory leak on file read errors
Diffstat (limited to 'lib/compiler/vsn.mk')
-rw-r--r--lib/compiler/vsn.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/compiler/vsn.mk b/lib/compiler/vsn.mk
index c7e7fb6754..ab707885f4 100644
--- a/lib/compiler/vsn.mk
+++ b/lib/compiler/vsn.mk
@@ -1 +1 @@
-COMPILER_VSN = 7.2.5
+COMPILER_VSN = 7.2.6