aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustav Simonsson <[email protected]>2012-03-22 18:27:22 +0100
committerGustav Simonsson <[email protected]>2012-03-22 18:27:22 +0100
commitaa0d3a28d6f8350965d43cd13014125a63ac25d9 (patch)
tree49e61a067b3cfa702b9a34b5ea65e6d73c644996
parentef1ce2d3a03ed6c2ec5f6aa8e542aca4196171ca (diff)
parentb5f6596f49db47e6dacddb2b10292a7294e13993 (diff)
downloadotp-aa0d3a28d6f8350965d43cd13014125a63ac25d9.tar.gz
otp-aa0d3a28d6f8350965d43cd13014125a63ac25d9.tar.bz2
otp-aa0d3a28d6f8350965d43cd13014125a63ac25d9.zip
Merge branch 'maint'
-rw-r--r--lib/asn1/vsn.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/asn1/vsn.mk b/lib/asn1/vsn.mk
index ae92fcb11b..04f4b22421 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.19
+#next version number to use is 2.0
+ASN1_VSN = 1.7