X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/47671055438197794c88a6f7fb90acbc19fe413b..32c96bd755ac7ddc9fa26c0cf1d5eddd181bc51a:/ChangeLog

diff --git a/ChangeLog b/ChangeLog
index e2dc04ae..7708c89a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-05-11  Akim Demaille  <akim@lrde.epita.fr>
+
+	* data/lalr1.cc (yytranslate_): Rename token as t to avoid clashes
+	with the member "token".
+
+2006-04-27  Akim Demaille  <akim@lrde.epita.fr>
+
+	* data/glr.cc: Remove dead code.
+
 2006-04-25  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* bootstrap: Comment out the AM_CPPFLAGS line, since we don't use