Merge to RC branch

33 files changed, 0 insertions, 66 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index 702a8f1..fa23848 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -4,8 +4,6 @@
 # run "./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.143.2.11 2010/12/17 21:57:14 stwo Exp $
 
 # Current Tk version;  used in various names.
 
diff --git a/unix/README b/unix/README
index 23f4ba5..ea5c8fe 100644
--- a/unix/README
+++ b/unix/README
@@ -20,8 +20,6 @@ Linux, BSDI, and SCO UNIX. To compile for a PC running Windows, see the README
 file in the directory ../win. To compile for MacOSX, see the README file in
 the directory ../macosx.
 
-RCS: @(#) $Id: README,v 1.27 2008/02/14 15:45:43 dkf Exp $
-
 How To Compile And Install Tk:
 ------------------------------
 
diff --git a/unix/configure.in b/unix/configure.in
index 80269ff..28d1a07 100644
--- a/unix/configure.in
+++ b/unix/configure.in
@@ -2,8 +2,6 @@
 dnl	This file is an input file used by the GNU "autoconf" program to
 dnl	generate the file "configure", which is run during Tk installation
 dnl	to configure the system for the local environment.
-#
-# RCS: @(#) $Id: configure.in,v 1.153.2.13 2010/08/12 00:14:35 hobbs Exp $
 
 AC_INIT([tk],[8.5])
 AC_PREREQ(2.59)
diff --git a/unix/install-sh b/unix/install-sh
index 8cff938..1572b93 100644
--- a/unix/install-sh
+++ b/unix/install-sh
@@ -4,8 +4,6 @@
 # install - install a program, script, or datafile
 # This comes from X11R5; it is not part of GNU.
 #
-# $XConsortium: install.sh,v 1.2 89/12/18 14:47:22 jim Exp $
-#
 # This script is compatible with the BSD install script, but was written
 # from scratch.
 #
diff --git a/unix/tk.spec b/unix/tk.spec
index 8f10265..0680d85 100644
--- a/unix/tk.spec
+++ b/unix/tk.spec
@@ -1,4 +1,3 @@
-# $Id: tk.spec,v 1.34.2.10 2010/08/04 17:06:53 dgp Exp $
 # This file is the basis for a binary Tk Linux RPM.
 
 %{!?directory:%define directory /usr/local}
diff --git a/unix/tkAppInit.c b/unix/tkAppInit.c
index 526a3e8..050e226 100644
--- a/unix/tkAppInit.c
+++ b/unix/tkAppInit.c
@@ -9,8 +9,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkAppInit.c,v 1.8 2007/02/22 13:56:33 dkf Exp $
  */
 
 #include "tk.h"
diff --git a/unix/tkConfig.sh.in b/unix/tkConfig.sh.in
index f4e10ce..1b96f37 100644
--- a/unix/tkConfig.sh.in
+++ b/unix/tkConfig.sh.in
@@ -10,8 +10,6 @@
 # file in addition to this one.
 #
 # The information in this file is specific to a single platform.
-#
-# RCS: @(#) $Id: tkConfig.sh.in,v 1.13.2.1 2008/08/29 03:35:47 dgp Exp $
 
 # Tk's version number.
 TK_VERSION='@TK_VERSION@'
diff --git a/unix/tkUnix.c b/unix/tkUnix.c
index cd44149..3fa7387 100644
--- a/unix/tkUnix.c
+++ b/unix/tkUnix.c
@@ -9,8 +9,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnix.c,v 1.15 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnix3d.c b/unix/tkUnix3d.c
index c872484..417866b 100644
--- a/unix/tkUnix3d.c
+++ b/unix/tkUnix3d.c
@@ -8,8 +8,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnix3d.c,v 1.12 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixButton.c b/unix/tkUnixButton.c
index 0ca30f2..373f2e3 100644
--- a/unix/tkUnixButton.c
+++ b/unix/tkUnixButton.c
@@ -7,8 +7,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixButton.c,v 1.25.2.1 2009/10/24 00:12:03 dkf Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixColor.c b/unix/tkUnixColor.c
index 5148b33..e9fdf11 100644
--- a/unix/tkUnixColor.c
+++ b/unix/tkUnixColor.c
@@ -8,8 +8,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixColor.c,v 1.6.2.1 2009/10/25 17:04:26 dkf Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixConfig.c b/unix/tkUnixConfig.c
index 91a992a..2862eff 100644
--- a/unix/tkUnixConfig.c
+++ b/unix/tkUnixConfig.c
@@ -8,8 +8,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixConfig.c,v 1.6 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixCursor.c b/unix/tkUnixCursor.c
index d57db13..2169d1c 100644
--- a/unix/tkUnixCursor.c
+++ b/unix/tkUnixCursor.c
@@ -7,8 +7,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixCursor.c,v 1.13 2008/03/26 19:34:53 dgp Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixDefault.h b/unix/tkUnixDefault.h
index 2d16d4a..4eb8778 100644
--- a/unix/tkUnixDefault.h
+++ b/unix/tkUnixDefault.h
@@ -9,8 +9,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixDefault.h,v 1.26 2007/12/13 15:28:50 dgp Exp $
  */
 
 #ifndef _TKUNIXDEFAULT
diff --git a/unix/tkUnixDialog.c b/unix/tkUnixDialog.c
index 1299e90..2b86ca6 100644
--- a/unix/tkUnixDialog.c
+++ b/unix/tkUnixDialog.c
@@ -7,9 +7,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixDialog.c,v 1.6 2007/12/13 15:28:50 dgp Exp $
- *
  */
 
 #include "tkUnixInt.h"
diff --git a/unix/tkUnixDraw.c b/unix/tkUnixDraw.c
index 25741cc..c0d4d7f 100644
--- a/unix/tkUnixDraw.c
+++ b/unix/tkUnixDraw.c
@@ -7,8 +7,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixDraw.c,v 1.11 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixEmbed.c b/unix/tkUnixEmbed.c
index 9b93cb6..5b5f486 100644
--- a/unix/tkUnixEmbed.c
+++ b/unix/tkUnixEmbed.c
@@ -10,8 +10,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixEmbed.c,v 1.12 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "tkUnixInt.h"
diff --git a/unix/tkUnixEvent.c b/unix/tkUnixEvent.c
index 63e628a..67cff2d 100644
--- a/unix/tkUnixEvent.c
+++ b/unix/tkUnixEvent.c
@@ -8,8 +8,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixEvent.c,v 1.27.2.4 2011/01/06 06:00:12 stwo Exp $
  */
 
 #include "tkUnixInt.h"
diff --git a/unix/tkUnixFocus.c b/unix/tkUnixFocus.c
index b4cc4b5..0767618 100644
--- a/unix/tkUnixFocus.c
+++ b/unix/tkUnixFocus.c
@@ -8,8 +8,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixFocus.c,v 1.7 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "tkUnixInt.h"
diff --git a/unix/tkUnixFont.c b/unix/tkUnixFont.c
index d97723b..897770b 100644
--- a/unix/tkUnixFont.c
+++ b/unix/tkUnixFont.c
@@ -8,8 +8,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixFont.c,v 1.33 2007/02/28 09:23:30 dkf Exp $
  */
 
 #include "tkUnixInt.h"
diff --git a/unix/tkUnixInit.c b/unix/tkUnixInit.c
index 50797f2..1cc90a5 100644
--- a/unix/tkUnixInit.c
+++ b/unix/tkUnixInit.c
@@ -7,8 +7,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixInit.c,v 1.10 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "tkUnixInt.h"
diff --git a/unix/tkUnixInt.h b/unix/tkUnixInt.h
index e2e9ee6..805f314 100644
--- a/unix/tkUnixInt.h
+++ b/unix/tkUnixInt.h
@@ -8,8 +8,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixInt.h,v 1.5 2006/12/22 22:38:46 dkf Exp $
  */
 
 #ifndef _TKUNIXINT
diff --git a/unix/tkUnixKey.c b/unix/tkUnixKey.c
index 6c9f467..9c38891 100644
--- a/unix/tkUnixKey.c
+++ b/unix/tkUnixKey.c
@@ -8,8 +8,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixKey.c,v 1.13.2.3 2011/01/06 06:00:12 stwo Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixMenu.c b/unix/tkUnixMenu.c
index 4529200..eceb5b2 100644
--- a/unix/tkUnixMenu.c
+++ b/unix/tkUnixMenu.c
@@ -7,8 +7,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixMenu.c,v 1.19.2.1 2010/01/09 00:54:06 patthoyts Exp $
  */
 
 #include "default.h"
diff --git a/unix/tkUnixMenubu.c b/unix/tkUnixMenubu.c
index 08d796e..c6a7141 100644
--- a/unix/tkUnixMenubu.c
+++ b/unix/tkUnixMenubu.c
@@ -8,8 +8,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixMenubu.c,v 1.11 2007/12/13 15:28:50 dgp Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h
index 4805a6f..e0dbc8f 100644
--- a/unix/tkUnixPort.h
+++ b/unix/tkUnixPort.h
@@ -10,8 +10,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution
  * of this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixPort.h,v 1.14 2007/12/13 15:28:50 dgp Exp $
  */
 
 #ifndef _UNIXPORT
diff --git a/unix/tkUnixRFont.c b/unix/tkUnixRFont.c
index 8a9133d..134bb45 100644
--- a/unix/tkUnixRFont.c
+++ b/unix/tkUnixRFont.c
@@ -7,8 +7,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixRFont.c,v 1.24.2.5 2011/01/06 06:00:12 stwo Exp $
  */
 
 #include "tkUnixInt.h"
diff --git a/unix/tkUnixScale.c b/unix/tkUnixScale.c
index 4c925b7..e158549 100644
--- a/unix/tkUnixScale.c
+++ b/unix/tkUnixScale.c
@@ -8,8 +8,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixScale.c,v 1.13 2007/12/13 15:28:51 dgp Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixScrlbr.c b/unix/tkUnixScrlbr.c
index a23bba1..1e70925 100644
--- a/unix/tkUnixScrlbr.c
+++ b/unix/tkUnixScrlbr.c
@@ -8,8 +8,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixScrlbr.c,v 1.6.2.1 2009/10/07 14:31:02 dkf Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixSelect.c b/unix/tkUnixSelect.c
index fda261c..060fdd1 100644
--- a/unix/tkUnixSelect.c
+++ b/unix/tkUnixSelect.c
@@ -7,8 +7,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixSelect.c,v 1.21.4.2 2009/07/18 19:32:20 dkf Exp $
  */
 
 #include "tkInt.h"
diff --git a/unix/tkUnixSend.c b/unix/tkUnixSend.c
index 711315a..c073309 100644
--- a/unix/tkUnixSend.c
+++ b/unix/tkUnixSend.c
@@ -10,8 +10,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixSend.c,v 1.20.2.2 2009/12/20 23:16:30 dkf Exp $
  */
 
 #include "tkUnixInt.h"
diff --git a/unix/tkUnixWm.c b/unix/tkUnixWm.c
index 73d62c2..1d66412 100644
--- a/unix/tkUnixWm.c
+++ b/unix/tkUnixWm.c
@@ -11,8 +11,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixWm.c,v 1.58.2.9 2011/01/25 08:31:37 nijtmans Exp $
  */
 
 #include "tkUnixInt.h"
diff --git a/unix/tkUnixXId.c b/unix/tkUnixXId.c
index af43b7f..928c4d5 100644
--- a/unix/tkUnixXId.c
+++ b/unix/tkUnixXId.c
@@ -15,8 +15,6 @@
  *
  * See the file "license.terms" for information on usage and redistribution of
  * this file, and for a DISCLAIMER OF ALL WARRANTIES.
- *
- * RCS: @(#) $Id: tkUnixXId.c,v 1.10 2007/12/13 15:28:51 dgp Exp $
  */
 
 /*