Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_903XORG-6_8_99_902XORG-6_8_99_901XORG-6_8_99_900XORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_16XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch

7 files changed, 7 insertions, 7 deletions

diff --git a/CutPaste.c b/CutPaste.c
index dc5c818..30cd7dd 100644
--- a/CutPaste.c
+++ b/CutPaste.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xmag/CutPaste.c,v 1.6 2001/12/14 20:02:11 dawes Exp $ */
+/* $XFree86: xc/programs/xmag/CutPaste.c,v 1.5 2001/01/17 23:46:19 dawes Exp $ */
 /*
  * Author:  Davor Matic, MIT X Consortium
  */
diff --git a/RootWin.c b/RootWin.c
index 1a247a0..2cd5f38 100644
--- a/RootWin.c
+++ b/RootWin.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xmag/RootWin.c,v 1.5 2001/12/14 20:02:11 dawes Exp $ */
+/* $XFree86: xc/programs/xmag/RootWin.c,v 1.4 2001/01/17 23:46:20 dawes Exp $ */
 
 
 #include <X11/IntrinsicP.h>
diff --git a/Scale.c b/Scale.c
index 5b5751d..203d2fd 100644
--- a/Scale.c
+++ b/Scale.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xmag/Scale.c,v 3.9 2001/12/14 20:02:11 dawes Exp $ */
+/* $XFree86: xc/programs/xmag/Scale.c,v 3.8 2001/07/25 15:05:26 dawes Exp $ */
 
 /*
  * Author:  Davor Matic, MIT X Consortium
diff --git a/Scale.h b/Scale.h
index 83bb48e..2542886 100644
--- a/Scale.h
+++ b/Scale.h
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xmag/Scale.h,v 1.5 2001/12/14 20:02:11 dawes Exp $ */
+/* $XFree86: xc/programs/xmag/Scale.h,v 1.4 2001/01/17 23:46:20 dawes Exp $ */
 
 #ifndef _XawScale_h
 #define _XawScale_h
diff --git a/Xmag.ad b/Xmag.ad
index 0a24344..1bc4961 100644
--- a/Xmag.ad
+++ b/Xmag.ad
@@ -1,5 +1,5 @@
 ! $Xorg: Xmag.ad,v 1.3 2000/08/17 19:54:54 cpqbld Exp $
-! $XFree86: xc/programs/xmag/Xmag.ad,v 1.2 2003/01/19 04:44:45 paulo Exp $
+! $XFree86$
 *Font: fixed
 *pane2*orientation: horizontal
 *pane2*showGrip: False
diff --git a/xmag.c b/xmag.c
index bc75f1c..c5cc10a 100644
--- a/xmag.c
+++ b/xmag.c
@@ -26,7 +26,7 @@ other dealings in this Software without prior written authorization
 from The Open Group.
 
 */
-/* $XFree86: xc/programs/xmag/xmag.c,v 1.14 2003/09/21 13:05:51 herrb Exp $ */
+/* $XFree86: xmag.c,v 1.13 2003/05/27 22:27:07 tsi Exp $ */
 
 
 #include <stdlib.h>		/* for exit() and abs() */
diff --git a/xmag.man b/xmag.man
index adb3c51..b001df7 100644
--- a/xmag.man
+++ b/xmag.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xmag/xmag.man,v 1.7 2001/12/14 20:02:12 dawes Exp $
+.\" $XFree86: xc/programs/xmag/xmag.man,v 1.6 2001/01/27 18:21:18 dawes Exp $
 .\"
 .TH XMAG 1 __xorgversion__
 .SH NAME