summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2001-07-18 16:02:38 (GMT)
committerdgp <dgp@users.sourceforge.net>2001-07-18 16:02:38 (GMT)
commitd5bd088d898d07998e07af0f9e4cb6a29f342d38 (patch)
treefd57f1d5f782035b12889616159aaee64659f62b
parentb3f48b25110d57eab99cb1568d5818a9a45df71a (diff)
downloadtk-d5bd088d898d07998e07af0f9e4cb6a29f342d38.zip
tk-d5bd088d898d07998e07af0f9e4cb6a29f342d38.tar.gz
tk-d5bd088d898d07998e07af0f9e4cb6a29f342d38.tar.bz2
* Corrections in merge from HEAD
-rw-r--r--ChangeLog15
1 files changed, 15 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 2cfd96c..9dc1f36 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -109,6 +109,21 @@
* win/tkWinWm.c:
* win/tkWinX.c: Merged in updates from HEAD branch.
+2001-07-10 Mo DeJong <mdejong@redhat.com>
+
+ * unix/Makefile.in: Add AR and STLIB_LD variables.
+ * unix/configure:
+ * unix/configure.in: Use STLIB_LD when defining MAKE_LIB
+ and MAKE_STUB_LIB. Subst STLIB_LD, RANLIB, and AR.
+ * unix/tcl.m4: Update from Tcl.
+ * win/configure: Regen.
+ * win/tcl.m4: Update from Tcl.
+
+2001-07-06 Mo DeJong <mdejong@redhat.com>
+
+ * win/configure: Regen.
+ * win/tcl.m4: Update from Tcl.
+
2001-07-05 Mo DeJong <mdejong@redhat.com>
* win/Makefile.in: Subst DEPARG directly instead