X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/3519ec76a359c6236e4f043982c6a6433b04eac5..0619caf0b1e1f05b710bac41bcefa6d12206f285:/ChangeLog

diff --git a/ChangeLog b/ChangeLog
index c019e7da..8430f5c4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-10-02  Akim Demaille  <akim@epita.fr>
+
+	* src/conflicts.c (conflict_report): New function.
+	(conflict_log, verbose_conflict_log): Replace with...
+	(print_conflicts): this function.
+	Adjust dependencies.
+	* src/conflicts.h: New file.
+	Propagate its inclusion.
+
+	
 2000-10-02  Akim Demaille  <akim@epita.fr>
 
 	* src/nullable.h: New file.