Added man pages, Daniel
diff --git a/ChangeLog b/ChangeLog
index 861561b..ff671b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Aug 19 18:45:40 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
+
+	* libxml.4  xmllint.1 Makefile.am libxml.spec.in: added man pages
+
 Sat Aug 19 18:38:53 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
 
 	* doc/xml.html libxml.* structure.*: updated the doc a bit
@@ -29,7 +33,6 @@
 	* config.in: Removed @LIBS@ from xml-config because @XML_LIBS@
 	  includes @LIBS@
 
->>>>>>> 1.186
 Sat Aug 12 23:19:42 CEST 2000 Daniel Veillard <Daniel.Veillard@w3.org>
 
 	* doc/* : rebuilt the docs