Author: Isomer <isomer@undernet.org>

[ircu2.10.12-pk.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 9d3f325887a640fd1188330d32da201d0401f7e2..9fe4331a5709fe0ea157df813c99dd8e6fbb0dea 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-20  Perry Lorier <isomer@undernet.org>
+
+       * ircd/ircd_parser.y: Fixed parser to work with a more modern bison
+
 2004-01-21 Gavin Grieve <hektik@dimebox.net>
 
        * ircd/channel.c, include/channel.h: bring forward the IsUserParting()
@@ -74,6 +78,7 @@
        * ircd/res_adns.c: included sys/types.h, for non-Linux
        headers
 
+>>>>>>> 1.388
 2003-03-06  Kevin L. Mitchell  <klmitch@mit.edu>
 
        * libs/dbprim: database primitives library, including