--- a/netinstall/ChangeLog	Fri Oct 26 02:42:53 2001 +0000
+++ b/netinstall/ChangeLog	Tue Oct 30 05:13:31 2001 +0000
@@ -1,3 +1,30 @@
+2001-10-27  Andy Piper  <andy@xemacs.org>
+
+	* localdir.cc (dialog_cmd): allow download directory to be
+	created.
+	* log.cc (exit_setup): cygwin -> XEmacs
+	* net.cc (dialog_cmd):
+	 (dialog_proc):
+	 (do_net): sync with cygwin installer.
+	* res.rc:
+	* resource.h (IDS_CREATE_DIR): new.
+	* source.cc (load_dialog):
+	(save_dialog):
+	(dialog_cmd):
+	(dialog_proc):
+	(do_source): sync with cygwin installer.
+	* uninstall.cc (progress): remove log message.
+	* Makefile.in.in: generated setup-bin.ini correctly.
+	
+2001-10-25  Andy Piper  <andy@xemacs.org>
+
+	* Merge 21.5 codeline.
+	
+2001-10-25  Andy Piper  <andy@xemacs.org>
+
+	* setup.mak (OBJS): minor build fixes.
+	(distclean):
+
 2001-10-25  Andy Piper  <andy@xemacs.org>
 
 	* desktop.cc:
@@ -322,6 +349,7 @@
 
 	* all: port from cygwin setup.
 
-%%% $Id: ChangeLog,v 1.9 2001/10/26 02:42:53 andyp Exp $
-$Revision: 1.9 $
+%%% $Id: ChangeLog,v 1.10 2001/10/30 05:13:28 andyp Exp $
+$Revision: 1.10 $
 
+