X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/7400308fa383056ee5d5a78380a7c97b40325a70..0d8f3c8a7ab5a379c80caa26b64152c5a873942d:/ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 069e4fa9..d3362a91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2001-02-02  Akim Demaille  <akim@epita.fr>
+
+	* lib/malloc.c, lib/realloc.c: New, from the fileutils 4.0.37.
+	* lib/xalloc.h, lib/xmalloc.c@ Update.
+
+2001-01-19  Akim Demaille  <akim@epita.fr>
+
+	* src/conflicts.c (conflict_report): Report the difference with
+	expected number of s/r conflicts.
+
 2001-01-19  Akim Demaille  <akim@epita.fr>
 
 	Get rid of the ad hoc handling of token_buffer in the scanner: use