# HG changeset patch
# User Dave Love <fx@gnu.org>
# Date 958907267 0
# Node ID 6acf33a97675a54f477cc41ef61e54eef968dd9f
# Parent  71b1a76cd64a7c07d51b0ea77aa8beda74326ea1
*** empty log message ***

diff -r 71b1a76cd64a -r 6acf33a97675 lib-src/ChangeLog
--- a/lib-src/ChangeLog	Sun May 21 11:05:07 2000 +0000
+++ b/lib-src/ChangeLog	Sun May 21 11:07:47 2000 +0000
@@ -1,3 +1,10 @@
+2000-05-21  Dave Love  <fx@gnu.org>
+
+	* movemail.c: Include config.h, not ../src/config.h.
+	(Errmsg): Bump length.
+
+	* pop.c (ERROR_MAX): Increase to 160.
+
 2000-05-04  Gerd Moellmann  <gerd@gnu.org>
 
 	* ebrowse.c (DEFAULT_OUTFILE): Set to `BROWSE'.
@@ -20,7 +27,6 @@
 	(lang_names): Install it.
 	(Texinfo_suffixes): New variable.
 
->>>>>>> 2.24
 2000-04-19  Gerd Moellmann  <gerd@gnu.org>
 
 	* ebrowse.c (xmalloc, xrealloc): Rewritten.