From 695c11cc64f62c112d40c1db24195643fe7afe11 Mon Sep 17 00:00:00 2001
From: Lars G Thorsen <lars@erlang.org>
Date: Tue, 16 Feb 2010 09:48:04 +0000
Subject: ** Empty commit message **

---
 lib/xmerl/doc/src/notes.xml | 20 +++++++++++++++++---
 lib/xmerl/vsn.mk            | 20 +++++++++++---------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/lib/xmerl/doc/src/notes.xml b/lib/xmerl/doc/src/notes.xml
index 115c81a806..0f30ae9eca 100644
--- a/lib/xmerl/doc/src/notes.xml
+++ b/lib/xmerl/doc/src/notes.xml
@@ -4,7 +4,7 @@
 <chapter>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       compliance with the License. You should have received a copy of the
       Erlang Public License along with this software. If not, it can be
       retrieved online at http://www.erlang.org/.
-    
+
       Software distributed under the License is distributed on an "AS IS"
       basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
       the License for the specific language governing rights and limitations
       under the License.
-    
+
     </legalnotice>
 
     <title>Xmerl Release Notes</title>
@@ -31,6 +31,20 @@
   <p>This document describes the changes made to the Xmerl application.</p>
 
 
+<section><title>Xmerl 1.2.4</title>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+            <p>Updated the documentation Makefile to work with the 
+               new documentation build process.</p>
+            <p>
+            Own Id: OTP-8343</p>
+        </item>
+      </list>
+    </section>
+
+</section>
 
 
 <section><title>Xmerl 1.2.3</title>
diff --git a/lib/xmerl/vsn.mk b/lib/xmerl/vsn.mk
index 0bb57ea252..4162b52a80 100644
--- a/lib/xmerl/vsn.mk
+++ b/lib/xmerl/vsn.mk
@@ -1,28 +1,30 @@
 #
 # %CopyrightBegin%
-# 
-# Copyright Ericsson AB 2003-2009. All Rights Reserved.
-# 
+#
+# Copyright Ericsson AB 2003-2010. All Rights Reserved.
+#
 # The contents of this file are subject to the Erlang Public License,
 # Version 1.1, (the "License"); you may not use this file except in
 # compliance with the License. You should have received a copy of the
 # Erlang Public License along with this software. If not, it can be
 # retrieved online at http://www.erlang.org/.
-# 
+#
 # Software distributed under the License is distributed on an "AS IS"
 # basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 # the License for the specific language governing rights and limitations
 # under the License.
-# 
+#
 # %CopyrightEnd%
 #
 
-XMERL_VSN = 1.2.3
+XMERL_VSN = 1.2.4
+
 
 TICKETS	= \
-	OTP-8251 \
-	OTP-8252 \
-	OTP-8253 
+	OTP-8343
+
+TICKETS_1.2.4 = \
+	OTP-8343
 
 TICKETS_1.2.3 = \
 	OTP-8251 \
-- 
cgit v1.2.3