X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/5b0d29bb526b0d6b9ece984d07af7047d707157e..b83f0407c634814049e58f5ab14cc14c1daaa39f:/ChangeLog?ds=sidebyside

diff --git a/ChangeLog b/ChangeLog
index 6bb43074..49b0f394 100644
--- 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