* doc/bison.texinfo (Mystery Conflicts): Hint '-v' use.

[bison.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 6bb43074922385a3f5229093a5ec61ec5547ad72..49b0f394ec6337cff09ea0deb0bdd6298bcf0509 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2001-11-25  Marc Autret  <autret_m@epita.fr>
+
+       * doc/bison.texinfo (Mystery Conflicts): Hint '-v' use.
+       From Golubev I. N.
+
+2001-11-23  Akim Demaille  <akim@epita.fr>
+
+       * lib/alloca.c: Update, from fileutils.
+
 2001-11-23  Akim Demaille  <akim@epita.fr>
 
        * lib/Makefile.am (libbison_a_LIBADD): Add @ALLOCA@.
@@ -15,7 +24,6 @@
        * src/closure.c (itemsetsize): Likewise.
        * src/reader.c (symbol_list_new): Static.
 
-       
 2001-11-23  Akim Demaille  <akim@epita.fr>
 
        Attaching lineno to buckets is stupid, since only one copy of each