X-Git-Url: http://git.pk910.de/?a=blobdiff_plain;f=ChangeLog;h=054d663c96fb8fa095beb7afe6fc5806176bbb7b;hb=a39e3ba83a552a7f3259c989fa20c615e0840130;hp=ebfcee6a5489322241e191803de2770a7f755da1;hpb=f51ecc5090f86cf2c1b2127dc08c0fea0b058977;p=ircu2.10.12-pk.git

diff --git a/ChangeLog b/ChangeLog
index ebfcee6..054d663 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2004-06-23  Michael Poole <mdpoole@troilus.org>
+
+	* doc/Authors: Add contributors to ircu2.10.11 and myself.
+
+	* ircd/gline.c: Fix buglet in my forward port of Alex Badea's fix.
+
+	* configure.in: Add missing check for inttypes.h; remove obsolete
+	display of Head-in-sand, add display of epoll() engine.
+
+	* INSTALL, INSTALL_FR, doc/readme.cvs: Update descriptions of how
+	to use SourceForge's CVS server, from the u2.10.11 branch.
+
+2003-11-09 beware <steendijk@xs4all.nl>
+
+        * ircd/s_user.c: move assigning a numeric to a local client from
+	when nick is set, to when connection becomes client, to not waste
+	numerics.
+
+2004-06-08  Kevin L Mitchell  <klmitch@mit.edu>
+
+	* ircd/parse.c: don't let rank-and-file users escape HIS
+	limitations with /jupe...
+
 2004-06-18  Alex Badea  <decampos@users.sourceforge.net>
 
 	* ircd/gline.c (gline_lookup): only return a gline if it's
@@ -745,7 +768,6 @@
 	* 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