[libxml2: 3/3] Fix ChangeLog merge conflict

[Daniel Veillard <veillard src gnome org>]

commit 44af232c837312900f7d5c0ad58c2d52cdc8aa8f
Merge: 4ab6755... 798743a...
Author: Daniel Veillard <veillard redhat com>
Date:   Thu Jul 9 09:02:11 2009 +0200

    Fix ChangeLog merge conflict

 ChangeLog   |   12 ++++++++++++
 parser.c    |   18 +-----------------
 xmlwriter.c |    4 ++--
 3 files changed, 15 insertions(+), 19 deletions(-)
---
diff --cc ChangeLog
index 31aa926,b5c0a8b..9a1666d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,9 +1,20 @@@
++Thu Jul  9 08:52:35 CEST 2009 Daniel Veillard <daniel veillard com>
++
++	* config.h.in: update of libtool seems to have modified it
++	* python/libxml2class.txt: python update modified the order
++	  of classes apparently
++
 +Thu Jul  9 08:43:06 CEST 2009 Daniel Veillard <daniel veillard com>
 +
 +	* tree.c: avoid calling xmlAddID with NULL values
 +	* parser.c: add a few xmlInitParser in some entry points
 +
+ Fri Jun 19 19:51:08 CEST 2009 Rob Richards <rrichards cdatazone org>
+ 
+ 	* parser.c: use options from current parser context when creating 
+ 	  a parser context within xmlParseCtxtExternalEntity
+ 	* xmlwriter.c: fix error message when unable to create output file
+ 
  Thu Jun  4 11:17:23 CEST 2009 Daniel Veillard <daniel veillard com>
  
  	* c14n.c debugXML.c doc/examples/io2.c parser.c schematron.c