merge stable branch onto HEAD

13 files changed, 14 insertions, 14 deletions

diff --git a/win/Makefile.in b/win/Makefile.in
index 44e686f..e6802cd 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -4,7 +4,7 @@
 # "./configure", which is a configuration script generated by the "autoconf"
 # program (constructs like "@foo@" will get replaced in the actual Makefile.
 #
-# RCS: @(#) $Id: Makefile.in,v 1.120 2007/12/03 21:26:03 dgp Exp $
+# RCS: @(#) $Id: Makefile.in,v 1.121 2007/12/13 15:28:43 dgp Exp $
 
 VERSION = @TCL_VERSION@
 
diff --git a/win/coffbase.txt b/win/coffbase.txt
index 3cb23e0..ad2822e 100644
--- a/win/coffbase.txt
+++ b/win/coffbase.txt
@@ -12,7 +12,7 @@
 ; they're mutually exclusive.  This info is placed in the DLL's PE header by the
 ; linker with the `-base:@$(TCLDIR)\win\coffbase.txt,<key>` option.
 ;
-; RCS: @(#) $Id: coffbase.txt,v 1.10 2007/10/12 14:09:46 patthoyts Exp $
+; RCS: @(#) $Id: coffbase.txt,v 1.11 2007/12/13 15:28:43 dgp Exp $
 
 tcl		0x10000000	0x00200000
 tcldde		0x10200000	0x00010000
diff --git a/win/configure b/win/configure
index 6f1929e..5dbcca8 100755
--- a/win/configure
+++ b/win/configure
@@ -1267,7 +1267,7 @@ SHELL=/bin/sh
 TCL_VERSION=8.5
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL="b3"
+TCL_PATCH_LEVEL=".0"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.3
diff --git a/win/configure.in b/win/configure.in
index 7238cc9..2eb21b6 100644
--- a/win/configure.in
+++ b/win/configure.in
@@ -3,7 +3,7 @@
 # generate the file "configure", which is run during Tcl installation
 # to configure the system for the local environment.
 #
-# RCS: @(#) $Id: configure.in,v 1.98 2007/11/19 18:14:51 dgp Exp $
+# RCS: @(#) $Id: configure.in,v 1.99 2007/12/13 15:28:43 dgp Exp $
 
 AC_INIT(../generic/tcl.h)
 AC_PREREQ(2.59)
@@ -16,7 +16,7 @@ SHELL=/bin/sh
 TCL_VERSION=8.5
 TCL_MAJOR_VERSION=8
 TCL_MINOR_VERSION=5
-TCL_PATCH_LEVEL="b3"
+TCL_PATCH_LEVEL=".0"
 VER=$TCL_MAJOR_VERSION$TCL_MINOR_VERSION
 
 TCL_DDE_VERSION=1.3
diff --git a/win/makefile.vc b/win/makefile.vc
index cfff601..9b6aa79 100644
--- a/win/makefile.vc
+++ b/win/makefile.vc
@@ -12,7 +12,7 @@
 # Copyright (c) 2001-2004 David Gravereaux.
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: makefile.vc,v 1.173 2007/11/30 01:10:34 hobbs Exp $
+# RCS: @(#) $Id: makefile.vc,v 1.174 2007/12/13 15:28:43 dgp Exp $
 #------------------------------------------------------------------------------
 
 # Check to see we are configured to build with MSVC (MSDEVDIR or MSVCDIR)
diff --git a/win/nmakehlp.c b/win/nmakehlp.c
index 00d2075..3b04998 100644
--- a/win/nmakehlp.c
+++ b/win/nmakehlp.c
@@ -11,7 +11,7 @@
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
  * ----------------------------------------------------------------------------
- * RCS: @(#) $Id: nmakehlp.c,v 1.19 2007/10/12 14:09:46 patthoyts Exp $
+ * RCS: @(#) $Id: nmakehlp.c,v 1.20 2007/12/13 15:28:43 dgp Exp $
  * ----------------------------------------------------------------------------
  */
 
diff --git a/win/rules.vc b/win/rules.vc
index 9389b1f..83a82b9 100644
--- a/win/rules.vc
+++ b/win/rules.vc
@@ -11,7 +11,7 @@
 # Copyright (c) 2003-2007 Patrick Thoyts
 #
 #------------------------------------------------------------------------------
-# RCS: @(#) $Id: rules.vc,v 1.34 2007/12/10 16:23:49 patthoyts Exp $
+# RCS: @(#) $Id: rules.vc,v 1.35 2007/12/13 15:28:43 dgp Exp $
 #------------------------------------------------------------------------------
 
 !ifndef _RULES_VC
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
index 8fd1bb5..9e6a0f0 100644
--- a/win/tclWin32Dll.c
+++ b/win/tclWin32Dll.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWin32Dll.c,v 1.53 2007/11/15 09:21:55 patthoyts Exp $
+ * RCS: @(#) $Id: tclWin32Dll.c,v 1.54 2007/12/13 15:28:43 dgp Exp $
  */
 
 #include "tclWinInt.h"
diff --git a/win/tclWinFile.c b/win/tclWinFile.c
index 2220062..66ecdf8 100644
--- a/win/tclWinFile.c
+++ b/win/tclWinFile.c
@@ -11,7 +11,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinFile.c,v 1.94 2007/06/28 21:24:58 dgp Exp $
+ * RCS: @(#) $Id: tclWinFile.c,v 1.95 2007/12/13 15:28:44 dgp Exp $
  */
 
 /* #define _WIN32_WINNT	0x0500 */
diff --git a/win/tclWinInit.c b/win/tclWinInit.c
index 09a6b0a..f0c2a9e 100644
--- a/win/tclWinInit.c
+++ b/win/tclWinInit.c
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinInit.c,v 1.74 2007/11/19 11:31:58 dkf Exp $
+ * RCS: @(#) $Id: tclWinInit.c,v 1.75 2007/12/13 15:28:44 dgp Exp $
  */
 
 #include "tclWinInt.h"
diff --git a/win/tclWinPort.h b/win/tclWinPort.h
index ae17a5e..bca0b7e 100644
--- a/win/tclWinPort.h
+++ b/win/tclWinPort.h
@@ -10,7 +10,7 @@
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinPort.h,v 1.49 2007/10/11 21:35:03 dgp Exp $
+ * RCS: @(#) $Id: tclWinPort.h,v 1.50 2007/12/13 15:28:44 dgp Exp $
  */
 
 #ifndef _TCLWINPORT
diff --git a/win/tclWinSock.c b/win/tclWinSock.c
index 3371f9f..af24fdf 100644
--- a/win/tclWinSock.c
+++ b/win/tclWinSock.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinSock.c,v 1.60 2007/11/30 01:09:11 hobbs Exp $
+ * RCS: @(#) $Id: tclWinSock.c,v 1.61 2007/12/13 15:28:44 dgp Exp $
  */
 
 #include "tclWinInt.h"
diff --git a/win/tclWinTest.c b/win/tclWinTest.c
index beb3338..946f179 100644
--- a/win/tclWinTest.c
+++ b/win/tclWinTest.c
@@ -8,7 +8,7 @@
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
  *
- * RCS: @(#) $Id: tclWinTest.c,v 1.21 2007/11/19 11:35:59 dkf Exp $
+ * RCS: @(#) $Id: tclWinTest.c,v 1.22 2007/12/13 15:28:44 dgp Exp $
  */
 
 #include "tclInt.h"