* src/conflicts.c (conflict_report): New function.

[bison.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index c019e7da31f793338a1e8e3594502092585ee69d..8430f5c4550087d80fe1b10ffc0591ffac5f71af 100644 (file)
--- 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.