Merging XORG-CURRENT into trunkXACE-SELINUX-MERGECOMPOSITEWRAP

46 files changed, 46 insertions, 46 deletions

diff --git a/src/ActionHook.c b/src/ActionHook.c
index 04322ef..32aca9c 100644
--- a/src/ActionHook.c
+++ b/src/ActionHook.c
@@ -60,7 +60,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/ActionHook.c,v 1.3 2001/12/14 19:56:05 dawes Exp $ */
+/* $XFree86: xc/lib/Xt/ActionHook.c,v 1.2 2001/08/22 22:52:17 dawes Exp $ */
 
 /* 
  * Contains XtAppAddActionHook, XtRemoveActionHook
diff --git a/src/Alloc.c b/src/Alloc.c
index 939d216..42154bc 100644
--- a/src/Alloc.c
+++ b/src/Alloc.c
@@ -58,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/Alloc.c,v 1.10 2003/12/30 01:45:07 tsi Exp $ */
+/* $XFree86: xc/lib/Xt/Alloc.c,v 1.9 2001/12/14 19:56:07 dawes Exp $ */
 
 /*
  * X Toolkit Memory Allocation Routines
diff --git a/src/Callback.c b/src/Callback.c
index fb03874..a6d6696 100644
--- a/src/Callback.c
+++ b/src/Callback.c
@@ -58,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/Callback.c,v 1.9 2003/04/21 16:34:26 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/Callback.c,v 1.8 2001/12/14 19:56:08 dawes Exp $ */
 
 #include "IntrinsicI.h"
 
diff --git a/src/Composite.c b/src/Composite.c
index c3612cc..a2e43f4 100644
--- a/src/Composite.c
+++ b/src/Composite.c
@@ -58,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/Composite.c,v 1.6 2001/12/14 19:56:08 dawes Exp $ */
+/* $XFree86: xc/lib/Xt/Composite.c,v 1.5 2001/08/22 22:52:17 dawes Exp $ */
 
 #define COMPOSITE
 #include "IntrinsicI.h"
diff --git a/src/Constraint.c b/src/Constraint.c
index 3f1d3d5..459e078 100644
--- a/src/Constraint.c
+++ b/src/Constraint.c
@@ -58,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/Constraint.c,v 1.3 2001/12/14 19:56:09 dawes Exp $ */
+/* $XFree86: xc/lib/Xt/Constraint.c,v 1.2 2001/08/22 22:52:17 dawes Exp $ */
 
 #define CONSTRAINT
 #include "IntrinsicI.h"
diff --git a/src/Convert.c b/src/Convert.c
index 256240c..634c9a6 100644
--- a/src/Convert.c
+++ b/src/Convert.c
@@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/Convert.c,v 3.8 2003/04/21 16:34:26 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/Convert.c,v 3.7 2001/12/14 19:56:09 dawes Exp $ */
 
 /*
 
diff --git a/src/Converters.c b/src/Converters.c
index 801279a..0cad630 100644
--- a/src/Converters.c
+++ b/src/Converters.c
@@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/Converters.c,v 3.15 2003/05/27 22:26:42 tsi Exp $ */
+/* $XFree86: xc/lib/Xt/Converters.c,v 3.14tsi Exp $ */
 
 /*
 
diff --git a/src/Create.c b/src/Create.c
index 6a95016..27244d4 100644
--- a/src/Create.c
+++ b/src/Create.c
@@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/Create.c,v 3.11 2003/04/21 16:34:26 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/Create.c,v 3.10 2002/12/17 04:50:58 dawes Exp $ */
 
 /*
 
diff --git a/src/Destroy.c b/src/Destroy.c
index bc81e1f..8fc072b 100644
--- a/src/Destroy.c
+++ b/src/Destroy.c
@@ -58,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/Destroy.c,v 1.3 2001/12/14 19:56:11 dawes Exp $ */
+/* $XFree86: xc/lib/Xt/Destroy.c,v 1.2 2001/08/22 22:52:18 dawes Exp $ */
 
 #include "IntrinsicI.h"
 
diff --git a/src/Display.c b/src/Display.c
index f39bb83..eea5fc4 100644
--- a/src/Display.c
+++ b/src/Display.c
@@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/Display.c,v 3.16 2003/04/21 16:34:26 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/Display.c,v 3.15 2002/09/18 01:25:01 dawes Exp $ */
 
 /*
 
diff --git a/src/Error.c b/src/Error.c
index 498ddfd..d0886ef 100644
--- a/src/Error.c
+++ b/src/Error.c
@@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/Error.c,v 3.14 2003/05/27 22:26:42 tsi Exp $ */
+/* $XFree86: xc/lib/Xt/Error.c,v 3.13tsi Exp $ */
 
 /*
 
diff --git a/src/Event.c b/src/Event.c
index e7dadc8..6ab810d 100644
--- a/src/Event.c
+++ b/src/Event.c
@@ -58,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/Event.c,v 3.11 2003/04/21 16:34:27 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/Event.c,v 3.10 2001/12/14 19:56:11 dawes Exp $ */
 
 #include "IntrinsicI.h"
 #include "Shell.h"
diff --git a/src/EventUtil.c b/src/EventUtil.c
index 92a1af4..df0b7ea 100644
--- a/src/EventUtil.c
+++ b/src/EventUtil.c
@@ -59,7 +59,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/EventUtil.c,v 1.7 2003/04/21 16:34:27 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/EventUtil.c,v 1.6 2001/12/14 19:56:13 dawes Exp $ */
 
 #include "IntrinsicI.h"
 #include "PassivGraI.h"
diff --git a/src/GCManager.c b/src/GCManager.c
index 5cd2b25..dd765c5 100644
--- a/src/GCManager.c
+++ b/src/GCManager.c
@@ -58,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/GCManager.c,v 1.6 2001/12/14 19:56:14 dawes Exp $ */
+/* $XFree86: xc/lib/Xt/GCManager.c,v 1.5 2001/08/22 22:52:18 dawes Exp $ */
 
 #include "IntrinsicI.h"
 
diff --git a/src/Geometry.c b/src/Geometry.c
index f25c2e4..853bf04 100644
--- a/src/Geometry.c
+++ b/src/Geometry.c
@@ -58,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/Geometry.c,v 1.13 2003/04/21 16:34:27 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/Geometry.c,v 1.12 2001/12/14 19:56:15 dawes Exp $ */
 
 #include "IntrinsicI.h"
 #include "ShellP.h"
diff --git a/src/GetResList.c b/src/GetResList.c
index 7b60b33..b84160c 100644
--- a/src/GetResList.c
+++ b/src/GetResList.c
@@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/GetResList.c,v 3.6 2001/12/14 19:56:16 dawes Exp $ */
+/* $XFree86: xc/lib/Xt/GetResList.c,v 3.5 2001/08/22 22:52:18 dawes Exp $ */
 
 /*
 
diff --git a/src/GetValues.c b/src/GetValues.c
index 0434500..bb09a27 100644
--- a/src/GetValues.c
+++ b/src/GetValues.c
@@ -59,7 +59,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/GetValues.c,v 1.3 2001/12/14 19:56:16 dawes Exp $ */
+/* $XFree86: xc/lib/Xt/GetValues.c,v 1.2 2001/08/22 22:52:18 dawes Exp $ */
 
 #include "IntrinsicI.h"
 #include "StringDefs.h"
diff --git a/src/HookObj.c b/src/HookObj.c
index 881e55f..697974a 100644
--- a/src/HookObj.c
+++ b/src/HookObj.c
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/HookObj.c,v 1.3 2001/12/14 19:56:17 dawes Exp $ */
+/* $XFree86: xc/lib/Xt/HookObj.c,v 1.2 2001/08/22 22:52:18 dawes Exp $ */
 
 #include "IntrinsicI.h"
 #include "StringDefs.h"
diff --git a/src/Hooks.c b/src/Hooks.c
index 71f9ab0..af6b49f 100644
--- a/src/Hooks.c
+++ b/src/Hooks.c
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/Hooks.c,v 1.4 2003/04/21 16:34:27 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/Hooks.c,v 1.3 2001/12/14 19:56:18 dawes Exp $ */
 
 /*LINTLIBRARY*/
 
diff --git a/src/Initialize.c b/src/Initialize.c
index e590666..9ad6522 100644
--- a/src/Initialize.c
+++ b/src/Initialize.c
@@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/Initialize.c,v 3.22 2003/12/22 21:10:25 dickey Exp $ */
+/* $XFree86: xc/lib/Xt/Initialize.c,v 3.21 2003/04/21 16:34:27 herrb Exp $ */
 
 /*
 
diff --git a/src/Intrinsic.c b/src/Intrinsic.c
index 98bfa43..a315ed1 100644
--- a/src/Intrinsic.c
+++ b/src/Intrinsic.c
@@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/Intrinsic.c,v 3.23 2003/04/21 16:34:27 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/Intrinsic.c,v 3.22 2003/01/12 03:55:46 tsi Exp $ */
 
 /*
 
diff --git a/src/Keyboard.c b/src/Keyboard.c
index 0bfdf96..2f3db03 100644
--- a/src/Keyboard.c
+++ b/src/Keyboard.c
@@ -59,7 +59,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/Keyboard.c,v 3.4 2001/12/14 19:56:26 dawes Exp $ */
+/* $XFree86: xc/lib/Xt/Keyboard.c,v 3.3 2001/08/22 22:52:19 dawes Exp $ */
 
 #include "IntrinsicI.h"
 
diff --git a/src/Manage.c b/src/Manage.c
index 04a779b..ece5ff5 100644
--- a/src/Manage.c
+++ b/src/Manage.c
@@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/Manage.c,v 3.11 2003/08/27 21:39:38 tsi Exp $ */
+/* $XFree86: xc/lib/Xt/Manage.c,v 3.10tsi Exp $ */
 
 /*
 
diff --git a/src/NextEvent.c b/src/NextEvent.c
index c588a9c..277e52e 100644
--- a/src/NextEvent.c
+++ b/src/NextEvent.c
@@ -58,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/NextEvent.c,v 3.27 2003/04/21 16:34:28 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/NextEvent.c,v 3.26 2002/06/04 21:55:42 dawes Exp $ */
 
 #include "IntrinsicI.h"
 #include <stdio.h>
diff --git a/src/Object.c b/src/Object.c
index fc12be5..b680b2c 100644
--- a/src/Object.c
+++ b/src/Object.c
@@ -58,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/Object.c,v 1.6 2001/12/14 19:56:26 dawes Exp $ */
+/* $XFree86: xc/lib/Xt/Object.c,v 1.5 2001/01/17 19:43:06 dawes Exp $ */
 
 #define OBJECT
 #include "IntrinsicI.h"
diff --git a/src/PassivGrab.c b/src/PassivGrab.c
index 9f76806..8484c8a 100644
--- a/src/PassivGrab.c
+++ b/src/PassivGrab.c
@@ -33,7 +33,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ********************************************************/
-/* $XFree86: xc/lib/Xt/PassivGrab.c,v 3.7 2003/10/24 15:47:35 tsi Exp $ */
+/* $XFree86$ */
 
 /*
 
diff --git a/src/Popup.c b/src/Popup.c
index b51151e..055175b 100644
--- a/src/Popup.c
+++ b/src/Popup.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/Popup.c,v 1.4 2003/10/24 15:47:35 tsi Exp $ */
+/* $XFree86$ */
 
 #include "IntrinsicI.h"
 #include "ShellP.h"
diff --git a/src/RectObj.c b/src/RectObj.c
index bd7d5c5..1bb13a2 100644
--- a/src/RectObj.c
+++ b/src/RectObj.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/RectObj.c,v 1.3 2001/12/14 19:56:27 dawes Exp $ */
+/* $XFree86: xc/lib/Xt/RectObj.c,v 1.2 2001/08/22 22:52:19 dawes Exp $ */
 
 #define RECTOBJ
 #include "IntrinsicI.h"
diff --git a/src/ResConfig.c b/src/ResConfig.c
index e9ac7ae..59aa204 100644
--- a/src/ResConfig.c
+++ b/src/ResConfig.c
@@ -52,7 +52,7 @@ dealings in this Software without prior written authorization from the IBM
 Corporation.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/ResConfig.c,v 3.8 2001/12/14 19:56:28 dawes Exp $ */
+/* $XFree86: xc/lib/Xt/ResConfig.c,v 3.7 2001/08/22 22:52:19 dawes Exp $ */
 
 #include "Intrinsic.h"
 #include "IntrinsicI.h"
diff --git a/src/Resources.c b/src/Resources.c
index 859a801..8d717e3 100644
--- a/src/Resources.c
+++ b/src/Resources.c
@@ -59,7 +59,7 @@ in this Software without prior written authorization from The Open Group.
 
 */
 
-/* $XFree86: xc/lib/Xt/Resources.c,v 1.12 2003/08/27 21:39:38 tsi Exp $ */
+/* $XFree86: xc/lib/Xt/Resources.c,v 1.11tsi Exp $ */
 
 /*LINTLIBRARY*/
 #include "IntrinsicI.h"
diff --git a/src/Selection.c b/src/Selection.c
index 55d496c..1b65f20 100644
--- a/src/Selection.c
+++ b/src/Selection.c
@@ -58,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/Selection.c,v 3.10 2003/04/21 16:34:28 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/Selection.c,v 3.9 2001/12/14 19:56:29 dawes Exp $ */
 
 #include "IntrinsicI.h"
 #include "StringDefs.h"
diff --git a/src/SetSens.c b/src/SetSens.c
index 52e7d77..23dd0d4 100644
--- a/src/SetSens.c
+++ b/src/SetSens.c
@@ -58,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/SetSens.c,v 1.4 2003/04/21 16:34:28 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/SetSens.c,v 1.3 2001/12/14 19:56:29 dawes Exp $ */
 
 #include "IntrinsicI.h"
 #include "StringDefs.h"
diff --git a/src/SetValues.c b/src/SetValues.c
index 7465aff..60b6a62 100644
--- a/src/SetValues.c
+++ b/src/SetValues.c
@@ -58,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/SetValues.c,v 1.3 2001/12/14 19:56:30 dawes Exp $ */
+/* $XFree86: xc/lib/Xt/SetValues.c,v 1.2 2001/08/22 22:52:19 dawes Exp $ */
 
 #include "IntrinsicI.h"
 
diff --git a/src/Shell.c b/src/Shell.c
index 6d65bbb..5d15625 100644
--- a/src/Shell.c
+++ b/src/Shell.c
@@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/Shell.c,v 3.17 2003/05/27 22:26:43 tsi Exp $ */
+/* $XFree86: xc/lib/Xt/Shell.c,v 3.16tsi Exp $ */
 
 /*
 
diff --git a/src/TMaction.c b/src/TMaction.c
index ac8fcdd..6cca270 100644
--- a/src/TMaction.c
+++ b/src/TMaction.c
@@ -59,7 +59,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/TMaction.c,v 3.8 2003/04/21 16:34:28 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/TMaction.c,v 3.7 2001/12/14 19:56:30 dawes Exp $ */
 
 /* TMaction.c -- maintains the state table of actions for the translation 
  *              manager.
diff --git a/src/TMgrab.c b/src/TMgrab.c
index 50be71a..7ccb187 100644
--- a/src/TMgrab.c
+++ b/src/TMgrab.c
@@ -58,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/TMgrab.c,v 1.4 2003/04/21 16:34:28 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/TMgrab.c,v 1.3 2001/12/14 19:56:30 dawes Exp $ */
 
 /*LINTLIBRARY*/
 #include "IntrinsicI.h"
diff --git a/src/TMkey.c b/src/TMkey.c
index e338954..56227b6 100644
--- a/src/TMkey.c
+++ b/src/TMkey.c
@@ -59,7 +59,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/TMkey.c,v 3.11 2003/04/21 16:34:28 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/TMkey.c,v 3.10 2001/12/14 19:56:30 dawes Exp $ */
 
 #define XK_MISCELLANY
 #define XK_LATIN1
diff --git a/src/TMparse.c b/src/TMparse.c
index ad57d00..47a3e8d 100644
--- a/src/TMparse.c
+++ b/src/TMparse.c
@@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/TMparse.c,v 3.11 2003/05/27 22:26:43 tsi Exp $ */
+/* $XFree86: xc/lib/Xt/TMparse.c,v 3.10tsi Exp $ */
 
 /*
 
diff --git a/src/TMprint.c b/src/TMprint.c
index db73700..082d80e 100644
--- a/src/TMprint.c
+++ b/src/TMprint.c
@@ -58,7 +58,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/TMprint.c,v 1.7 2003/04/21 16:34:29 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/TMprint.c,v 1.6 2001/12/14 19:56:31 dawes Exp $ */
 
 /*LINTLIBRARY*/
 #include "IntrinsicI.h"
diff --git a/src/TMstate.c b/src/TMstate.c
index 7f6646a..732b28d 100644
--- a/src/TMstate.c
+++ b/src/TMstate.c
@@ -32,7 +32,7 @@ OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION  WITH
 THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/TMstate.c,v 1.9 2003/04/21 16:34:29 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/TMstate.c,v 1.8 2001/12/14 19:56:31 dawes Exp $ */
 
 /*
 
diff --git a/src/Threads.c b/src/Threads.c
index 4ef3eec..766ef1c 100644
--- a/src/Threads.c
+++ b/src/Threads.c
@@ -53,7 +53,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/Threads.c,v 3.7 2003/04/21 16:34:29 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/Threads.c,v 3.6 2001/12/14 19:56:31 dawes Exp $ */
 
 #include "IntrinsicI.h"
 
diff --git a/src/VarCreate.c b/src/VarCreate.c
index 2aed5d4..ddff0f0 100644
--- a/src/VarCreate.c
+++ b/src/VarCreate.c
@@ -52,7 +52,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/VarCreate.c,v 3.7 2001/12/14 19:56:32 dawes Exp $ */
+/* $XFree86: xc/lib/Xt/VarCreate.c,v 3.6 2001/08/22 22:52:20 dawes Exp $ */
 
 #include "IntrinsicI.h"
 #include "StringDefs.h"
diff --git a/src/VarGet.c b/src/VarGet.c
index 237b49c..e87865f 100644
--- a/src/VarGet.c
+++ b/src/VarGet.c
@@ -51,7 +51,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/VarGet.c,v 1.8 2001/12/14 19:56:32 dawes Exp $ */
+/* $XFree86: xc/lib/Xt/VarGet.c,v 1.7 2001/07/29 05:01:12 tsi Exp $ */
 
 #include "IntrinsicI.h"
 #include "VarargsI.h"
diff --git a/src/Varargs.c b/src/Varargs.c
index 35a38f6..d0db287 100644
--- a/src/Varargs.c
+++ b/src/Varargs.c
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/Varargs.c,v 3.11 2003/04/21 16:34:29 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/Varargs.c,v 3.10 2001/12/14 19:56:32 dawes Exp $ */
 
 #include "IntrinsicI.h"
 #include "VarargsI.h"
diff --git a/src/Vendor.c b/src/Vendor.c
index b2f0b0d..aa2e7a6 100644
--- a/src/Vendor.c
+++ b/src/Vendor.c
@@ -46,7 +46,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/lib/Xt/Vendor.c,v 1.8 2003/12/22 21:10:25 dickey Exp $ */
+/* $XFree86: xc/lib/Xt/Vendor.c,v 1.7 2002/05/31 18:45:46 dawes Exp $ */
 
 /* Make sure all wm properties can make it out of the resource manager */
 
diff --git a/src/sharedlib.c b/src/sharedlib.c
index 17c25fd..a3dc6a7 100644
--- a/src/sharedlib.c
+++ b/src/sharedlib.c
@@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
 in this Software without prior written authorization from The Open Group.
 
 */
-/* $XFree86: xc/lib/Xt/sharedlib.c,v 3.8 2003/04/21 16:34:29 herrb Exp $ */
+/* $XFree86: xc/lib/Xt/sharedlib.c,v 3.7 2002/05/31 18:45:46 dawes Exp $ */
 
 #if (defined(SUNSHLIB) || defined(AIXSHLIB)) && !defined(SHAREDCODE)
 #include "IntrinsicI.h"