aboutsummaryrefslogtreecommitdiffstats
path: root/lib/xmerl
diff options
context:
space:
mode:
authorMagnus Lidén <[email protected]>2013-12-10 14:31:40 +0100
committerMagnus Lidén <[email protected]>2013-12-10 14:31:40 +0100
commit458e302f61e2de36ebd49c5a5a5b984224bdce94 (patch)
tree0eaff569e08f2cd170275fb38eff8e56993ae47d /lib/xmerl
parent6d22d78204ca8bc8ed4beb92f6021ff3ba93a882 (diff)
parent25237481ccccd3ddfa74582dc267632ad618ba30 (diff)
downloadotp-458e302f61e2de36ebd49c5a5a5b984224bdce94.tar.gz
otp-458e302f61e2de36ebd49c5a5a5b984224bdce94.tar.bz2
otp-458e302f61e2de36ebd49c5a5a5b984224bdce94.zip
Merge tag 'OTP_R16B03'
The R16B03 release Conflicts: lib/sasl/vsn.mk
Diffstat (limited to 'lib/xmerl')
-rw-r--r--lib/xmerl/doc/src/notes.xml23
-rw-r--r--lib/xmerl/vsn.mk2
2 files changed, 24 insertions, 1 deletions
diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index a126f476bb..8f51262c81 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -31,6 +31,29 @@
<p>This document describes the changes made to the Xmerl application.</p>
+<section><title>Xmerl 1.3.5</title>
+
+ <section><title>Improvements and New Features</title>
+ <list>
+ <item>
+ <p>
+ Teach xmerl_xpath to resolve context namespaces in more
+ cases. Thanks to Daniel White.</p>
+ <p>
+ Own Id: OTP-11461</p>
+ </item>
+ <item>
+ <p>
+ Avoid serialization on code_server in xmerl:export().
+ Thanks to Richard Carlsson.</p>
+ <p>
+ Own Id: OTP-11463</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Xmerl 1.3.4</title>
<section><title>Improvements and New Features</title>
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index af372d8248..4b933deb4a 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1 +1 @@
-XMERL_VSN = 1.3.4
+XMERL_VSN = 1.3.5