aboutsummaryrefslogtreecommitdiffstats
path: root/lib/asn1/vsn.mk
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2011-10-04 17:58:42 +0200
committerBjörn-Egil Dahlberg <[email protected]>2011-10-04 17:58:42 +0200
commitd01551f400e2a7944dcc10319be0c9f248ca3179 (patch)
tree628939585bd2fc87a3c4d985474bcb7d3e3cc452 /lib/asn1/vsn.mk
parentea34e624a30da0312cbea8b64d1484a46bb43656 (diff)
parentb6dc1a844eab061d0a7153d46e7e68296f15a504 (diff)
downloadotp-d01551f400e2a7944dcc10319be0c9f248ca3179.tar.gz
otp-d01551f400e2a7944dcc10319be0c9f248ca3179.tar.bz2
otp-d01551f400e2a7944dcc10319be0c9f248ca3179.zip
Merge branch 'dev' into major
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 36e082c8ba..b1132155e6 100644
--- a/lib/asn1/vsn.mk
+++ b/lib/asn1/vsn.mk
@@ -1,2 +1,2 @@
#next version number to use is 1.6.15 | 1.7 | 2.0
-ASN1_VSN = 1.6.17
+ASN1_VSN = 1.6.18