Mercurial > hg > xemacs-beta

diff src/ChangeLog @ 640:191dd517b9d5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2001-07-28 07:38:35 by stephent] 21.5.2 prerelease cleanups and documentation
author stephent
date Sat, 28 Jul 2001 07:38:49 +0000
parents 4b7d425dd3c2
children b17040ffddd1
line wrap: on
line diff
--- a/src/ChangeLog	Sat Jul 28 05:09:03 2001 +0000
+++ b/src/ChangeLog	Sat Jul 28 07:38:49 2001 +0000
@@ -929,7 +929,6 @@
 	path, instead of char*.
 	* systime.h: Include <sys/utime.h> on WIN32_NATIVE.
 
->>>>>>> 1.354
 2001-05-30  William M. Perry  <wmperry@gnu.org>
 
 	* emacs-marshals.c: Regenerated from lisp.