aboutsummaryrefslogtreecommitdiffstats
path: root/lib/asn1
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
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')
-rw-r--r--lib/asn1/doc/src/notes.xml19
-rw-r--r--lib/asn1/vsn.mk2
2 files changed, 20 insertions, 1 deletions
diff --git a/lib/asn1/doc/src/notes.xml b/lib/asn1/doc/src/notes.xml
index 5e221c03e9..52d770c9f6 100644
--- a/lib/asn1/doc/src/notes.xml
+++ b/lib/asn1/doc/src/notes.xml
@@ -31,6 +31,25 @@
<p>This document describes the changes made to the asn1 application.</p>
+<section><title>Asn1 1.6.18</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Implement or fix -Werror option</p>
+ <p>
+ If -Werror is enabled and there are warnings no output
+ file is written. Also make sure that error/warning
+ reporting is consistent. (Thanks to Tuncer Ayaz)</p>
+ <p>
+ Own Id: OTP-9536</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Asn1 1.6.17</title>
<section><title>Fixed Bugs and Malfunctions</title>
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