Merging XORG-CURRENT into trunkXACE-SELINUX-MERGE

5 files changed, 5 insertions, 5 deletions

diff --git a/XCalc.ad b/XCalc.ad
index 3520633..31d553e 100644
--- a/XCalc.ad
+++ b/XCalc.ad
@@ -1,5 +1,5 @@
 ! $XConsortium: XCalc.ad,v 1.13 94/03/03 19:19:32 converse Exp $
-! $XFree86: xc/programs/xcalc/XCalc.ad,v 1.3 2003/10/24 20:38:14 tsi Exp $
+! $XFree86$
 ! XCalc application class resource file
 
 XCalc.Title:		Calculator
diff --git a/math.c b/math.c
index c1da78e..b222e4b 100644
--- a/math.c
+++ b/math.c
@@ -1,5 +1,5 @@
 /* $XConsortium: math.c,v 1.17 91/07/25 17:51:34 rws Exp $ 
- * $XFree86: xc/programs/xcalc/math.c,v 1.6 2003/05/27 22:26:59 tsi Exp $ 
+ * $XFree86: xc/programs/xcalc/math.c,v 1.5tsi Exp $ 
  *
  *  math.c  -  mathematics functions for a hand calculator under X
  *
diff --git a/xcalc.c b/xcalc.c
index 775ab98..0f94311 100644
--- a/xcalc.c
+++ b/xcalc.c
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xcalc/xcalc.c,v 1.2 2000/05/11 18:14:41 tsi Exp $ */
+/* $XFree86$ */
 
 /*
  * xcalc.c  -  a hand calculator for the X Window system
diff --git a/xcalc.h b/xcalc.h
index bc4c5cb..df8916e 100644
--- a/xcalc.h
+++ b/xcalc.h
@@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization
 from the X Consortium.
 
 */
-/* $XFree86: xc/programs/xcalc/xcalc.h,v 1.2 2001/08/01 00:45:02 tsi Exp $ */
+/* $XFree86$ */
 
 /*
  * xcalc.h - symbolic constants for xcalc
diff --git a/xcalc.man b/xcalc.man
index 150378a..a0bfc79 100644
--- a/xcalc.man
+++ b/xcalc.man
@@ -25,7 +25,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from the X Consortium.
 .\"
-.\" $XFree86: xc/programs/xcalc/xcalc.man,v 1.5 2003/03/19 01:49:28 dawes Exp $
+.\" $XFree86: xc/programs/xcalc/xcalc.man,v 1.4 2002/10/12 16:06:46 herrb Exp $
 .\"
 .de EX		\"Begin example
 .ne 5