diff nt/ChangeLog @ 5178:97eb4942aec8

merge
author Ben Wing <ben@xemacs.org>
date Mon, 29 Mar 2010 21:28:13 -0500
parents 8b2f75cecb89 2ac3b54d3cae
children 0f7d483cff5a
line wrap: on
line diff
--- a/nt/ChangeLog	Tue Feb 23 07:28:35 2010 -0600
+++ b/nt/ChangeLog	Mon Mar 29 21:28:13 2010 -0500
@@ -5,6 +5,20 @@
 	* xemacs.mak (OPT_OBJS):
 	objects*.[ch] -> fontcolor*.[ch].
 
+2010-03-29  Vin Shelton  <acs@xemacs.org>
+
+	* xemacs.mak (TEMACS_COMMON_OBJS): Add array.obj and remove
+	dynarr.obj, to catch up with Ben's changes of 2010-03-28.
+
+2010-03-08  Vin Shelton  <acs@xemacs.org>
+
+	* xemacs.mak (batch_test_emacs): The test harness no longer
+	resides in $(testdir), per Ben's changes of 2010-02-22.
+
+2010-03-02  Jerry James  <james@xemacs.org>
+
+	* xemacs.mak (INFO_FILES): Removed custom.info.
+
 2010-02-18  Vin Shelton  <acs@xemacs.org>
 
 	* xemacs.mak (INFO_FILES): Removed term.info.