Mercurial > hg > xemacs-beta

diff netinstall/ChangeLog @ 864:5b3cf2203477

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2002-06-04 06:09:51 by andyp] merge 21.4 windows changes, minimally tested
author andyp
date Tue, 04 Jun 2002 06:12:31 +0000
parents 42375619fa45
children 2367ca81af28
line wrap: on
line diff
--- a/netinstall/ChangeLog	Tue Jun 04 06:05:53 2002 +0000
+++ b/netinstall/ChangeLog	Tue Jun 04 06:12:31 2002 +0000
@@ -451,9 +451,6 @@
 
 	* all: port from cygwin setup.
 
-<<<<<<< ChangeLog
-=======
-%%% $Id: ChangeLog,v 1.18 2002/06/04 06:04:38 andyp Exp $
-$Revision: 1.18 $
+%%% $Id: ChangeLog,v 1.19 2002/06/04 06:09:51 andyp Exp $
+$Revision: 1.19 $
 
->>>>>>> 1.2.2.11.2.10