summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwelch <welch@noemail.net>1998-07-28 17:42:19 (GMT)
committerwelch <welch@noemail.net>1998-07-28 17:42:19 (GMT)
commitda8165821c9d47b5ec2f0f7e55039c0ad84515f2 (patch)
tree81cbf1cc7136d7459b638ebb4166835dd35f8464
parent12767125aff1bd895e7a3a7058f60fb6dc0c3f2c (diff)
downloadtk-da8165821c9d47b5ec2f0f7e55039c0ad84515f2.zip
tk-da8165821c9d47b5ec2f0f7e55039c0ad84515f2.tar.gz
tk-da8165821c9d47b5ec2f0f7e55039c0ad84515f2.tar.bz2
Merged changes between child workspace "/home/welch/ws/tk8.0.3" and
parent workspace "/net/pop/export/home/ws/tk8.0". FossilOrigin-Name: 46a45d5fea7996148343e6890e4cbeeee3a1dcc2
-rw-r--r--win/makefile.vc4
1 files changed, 2 insertions, 2 deletions
diff --git a/win/makefile.vc b/win/makefile.vc
index 5d16758..d18adac 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -4,7 +4,7 @@
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
# Copyright (c) 1995-1996 Sun Microsystems, Inc.
-# SCCS: %Z% $Id: makefile.vc,v 1.6 1998/07/27 00:49:58 rjohnson Exp $
+# SCCS: %Z% $Id: makefile.vc,v 1.7 1998/07/28 17:42:20 welch Exp $
# Does not depend on the presence of any environment variables in
# order to compile tcl; all needed information is derived from
@@ -44,7 +44,7 @@ NODEBUG = 1
######################################################################
TCLNAMEPREFIX = tcl
-TKNAMEPREFIX = tcl
+TKNAMEPREFIX = tk
WISHNAMEPREFIX = wish
VERSION = 80