# HG changeset patch
# User Gerd Moellmann <gerd@gnu.org>
# Date 957477158 0
# Node ID 0c88826ad7fd3f664460e255ab0d4873d144c8c8
# Parent  03f206c5d91b8df9de92b349800d3672c0d7725d
*** empty log message ***

diff -r 03f206c5d91b -r 0c88826ad7fd lib-src/ChangeLog
--- a/lib-src/ChangeLog	Thu May 04 21:51:29 2000 +0000
+++ b/lib-src/ChangeLog	Thu May 04 21:52:38 2000 +0000
@@ -1,3 +1,7 @@
+2000-05-04  Gerd Moellmann  <gerd@gnu.org>
+
+	* ebrowse.c (DEFAULT_OUTFILE): Set to `BROWSE'.
+
 2000-05-02  Eli Zaretskii  <eliz@is.elta.co.il>
 
 	* ebrowse.c (PATH_LIST_SEPARATOR) [__MSDOS__ || WINDOWSNT]: Define
@@ -16,6 +20,7 @@
 	(lang_names): Install it.
 	(Texinfo_suffixes): New variable.
 
+>>>>>>> 2.24
 2000-04-19  Gerd Moellmann  <gerd@gnu.org>
 
 	* ebrowse.c (xmalloc, xrealloc): Rewritten.
diff -r 03f206c5d91b -r 0c88826ad7fd lisp/ChangeLog
--- a/lisp/ChangeLog	Thu May 04 21:51:29 2000 +0000
+++ b/lisp/ChangeLog	Thu May 04 21:52:38 2000 +0000
@@ -1,5 +1,9 @@
 2000-05-04  Gerd Moellmann  <gerd@gnu.org>
 
+	* progmodes/ebrowse.el: Change file name `EBROWSE' to `BROWSE'.
+
+	* files.el (auto-mode-alist): Change `EBROWSE' to `BROWSE'.
+
 	* subr.el (substitute-key-definition): Clarify documentation.
 
 2000-05-04  Milan Zamazal  <pdm@freesoft.cz>
diff -r 03f206c5d91b -r 0c88826ad7fd src/ChangeLog
Binary file src/ChangeLog has changed