diff nt/ChangeLog @ 863:42375619fa45

[xemacs-hg @ 2002-06-04 06:03:59 by andyp] merge 21.4 windows changes, minimally tested
author andyp
date Tue, 04 Jun 2002 06:05:53 +0000
parents 2b6fa2618f76
children 79c6ff3eef26
line wrap: on
line diff
--- a/nt/ChangeLog	Mon Jun 03 12:24:14 2002 +0000
+++ b/nt/ChangeLog	Tue Jun 04 06:05:53 2002 +0000
@@ -1,3 +1,7 @@
+2002-03-29  Jonathan Harris  <jonathan@xemacs.org>
+
+	* xemacs.mak: Define STACK_TRACE_EYE_CATCHER.
+
 2002-05-28  Ben Wing  <ben@xemacs.org>
 
 	* xemacs.mak (CFLAGS_NO_LIB):
@@ -339,7 +343,6 @@
 
 	* XEmacs 21.5.0 "alfalfa" is released.
 
->>>>>>> 1.120
 2001-03-14  Craig Lanning  <CraigL@Knology.net>
 
 	* minitar.c: Clean up some compiler warnings.