aboutsummaryrefslogtreecommitdiffstats
path: root/lib/asn1/vsn.mk
diff options
context:
space:
mode:
authorHenrik <[email protected]>2018-03-14 09:58:15 +0100
committerHenrik <[email protected]>2018-03-14 09:58:15 +0100
commit388b24ea7327ce8c7267b48c3a464ce8c404ddd6 (patch)
treee2d32963f888c4f358e7b020db65a3d591e360ed /lib/asn1/vsn.mk
parentc5005dc4f7381bb569c8f27aa7d3d264c4e41ce0 (diff)
parenta113f6117fd696ea6f84ed754055b4ec97a7ccb2 (diff)
downloadotp-388b24ea7327ce8c7267b48c3a464ce8c404ddd6.tar.gz
otp-388b24ea7327ce8c7267b48c3a464ce8c404ddd6.tar.bz2
otp-388b24ea7327ce8c7267b48c3a464ce8c404ddd6.zip
Merge branch 'maint'
Conflicts: OTP_VERSION
Diffstat (limited to 'lib/asn1/vsn.mk')
-rw-r--r--lib/asn1/vsn.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/asn1/vsn.mk b/lib/asn1/vsn.mk
index 4cd89089e9..39dfe8f4fb 100644
--- a/lib/asn1/vsn.mk
+++ b/lib/asn1/vsn.mk
@@ -1 +1 @@
-ASN1_VSN = 5.0.4
+ASN1_VSN = 5.0.5