Fix ChangeLog merge conflict
tree: a74f4e85e151cbe6ef91464ed646c816797d8ae6
  1. bakefile/
  2. doc/
  3. example/
  4. include/
  5. macos/
  6. optim/
  7. python/
  8. result/
  9. test/
  10. vms/
  11. VxWorks/
  12. win32/
  13. xstc/
  14. .cvsignore
  15. acconfig.h
  16. acinclude.m4
  17. AUTHORS
  18. autogen.sh
  19. build_glob.py
  20. c14n.c
  21. catalog.c
  22. ChangeLog
  23. check-relaxng-test-suite.py
  24. check-relaxng-test-suite2.py
  25. check-xinclude-test-suite.py
  26. check-xml-test-suite.py
  27. check-xsddata-test-suite.py
  28. chvalid.c
  29. chvalid.def
  30. config.h.in
  31. configure.in
  32. Copyright
  33. dbgen.pl
  34. dbgenattr.pl
  35. debugXML.c
  36. dict.c
  37. DOCBparser.c
  38. elfgcchack.h
  39. encoding.c
  40. entities.c
  41. error.c
  42. genChRanges.py
  43. gentest.py
  44. genUnicode.py
  45. global.data
  46. globals.c
  47. HACKING
  48. hash.c
  49. HTMLparser.c
  50. HTMLtree.c
  51. INSTALL
  52. install-sh
  53. legacy.c
  54. libxml-2.0-uninstalled.pc.in
  55. libxml-2.0.pc.in
  56. libxml.3
  57. libxml.h
  58. libxml.m4
  59. libxml.spec.in
  60. libxml2.doap
  61. list.c
  62. MAINTAINERS
  63. Makefile.am
  64. Makefile.tests
  65. Makefile.win
  66. missing
  67. mkinstalldirs
  68. nanoftp.c
  69. nanohttp.c
  70. NEWS
  71. parser.c
  72. parserInternals.c
  73. pattern.c
  74. README
  75. README.cvs-commits
  76. README.tests
  77. regressions.py
  78. regressions.xml
  79. relaxng.c
  80. rngparser.c
  81. runsuite.c
  82. runtest.c
  83. runxmlconf.c
  84. SAX.c
  85. SAX2.c
  86. schematron.c
  87. testapi.c
  88. testAutomata.c
  89. testC14N.c
  90. testchar.c
  91. testdict.c
  92. testdso.c
  93. testHTML.c
  94. testModule.c
  95. testOOM.c
  96. testOOMlib.c
  97. testOOMlib.h
  98. testReader.c
  99. testrecurse.c
  100. testRegexp.c
  101. testRelax.c
  102. testSAX.c
  103. testSchemas.c
  104. testThreads.c
  105. testThreadsWin32.c
  106. testURI.c
  107. testXPath.c
  108. threads.c
  109. TODO
  110. TODO_SCHEMAS
  111. tree.c
  112. trio.c
  113. trio.h
  114. triodef.h
  115. trionan.c
  116. trionan.h
  117. triop.h
  118. triostr.c
  119. triostr.h
  120. uri.c
  121. valid.c
  122. xinclude.c
  123. xlink.c
  124. xml2-config.1
  125. xml2-config.in
  126. xml2Conf.sh.in
  127. xmlcatalog.c
  128. xmlIO.c
  129. xmllint.c
  130. xmlmemory.c
  131. xmlmodule.c
  132. xmlreader.c
  133. xmlregexp.c
  134. xmlsave.c
  135. xmlschemas.c
  136. xmlschemastypes.c
  137. xmlstring.c
  138. xmlunicode.c
  139. xmlwriter.c
  140. xpath.c
  141. xpointer.c