Merging XORG-CURRENT into trunkrel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-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-MERGElg3d-masterlg3d-eventlg3d-dev-0-7-1lg3d-dev-0-7-0lg3d-dev-0-6-latestlg3d-dev-0-6-2lg3d-dev-0-6-1-latestlg3d-dev-0-6-1-currentlg3d-dev-0-6-1-1lg3d-dev-0-6-1lg3dXORG-6_8-branchCOMPOSITEWRAP

6 files changed, 8 insertions, 7 deletions

diff --git a/Clock.c b/Clock.c
index 41c5318..ce60d72 100644
--- a/Clock.c
+++ b/Clock.c
@@ -1,4 +1,5 @@
 /* $Xorg: Clock.c,v 1.4 2001/02/09 02:05:39 xorgcvs Exp $ */
+/* $XdotOrg$ */
 
 /***********************************************************
 
@@ -46,7 +47,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/xclock/Clock.c,v 3.26 2003/10/25 00:52:37 dawes Exp $ */
+/* $XFree86: xc/programs/xclock/Clock.c,v 3.25 2003/07/04 16:24:30 eich Exp $ */
 
 #include <X11/Xlib.h>
 #include <X11/StringDefs.h>
@@ -82,7 +83,7 @@ SOFTWARE.
 
 #define max(a, b) ((a) > (b) ? (a) : (b))
 #define min(a, b) ((a) < (b) ? (a) : (b))
-#define abs(a) ((a) < 0 ? -(a) : (a))
+/* #define abs(a) ((a) < 0 ? -(a) : (a)) */
 
 
 /* Initialization of defaults */
diff --git a/Clock.h b/Clock.h
index b209994..cf0744e 100644
--- a/Clock.h
+++ b/Clock.h
@@ -49,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/xclock/Clock.h,v 1.12 2002/10/21 13:33:07 alanh Exp $ */
+/* $XFree86: xc/programs/xclock/Clock.h,v 1.11 2002/10/17 01:00:01 dawes Exp $ */
 
 #ifndef _XawClock_h
 #define _XawClock_h
diff --git a/ClockP.h b/ClockP.h
index 50fba01..dac30a4 100644
--- a/ClockP.h
+++ b/ClockP.h
@@ -49,7 +49,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
 SOFTWARE.
 
 ******************************************************************/
-/* $XFree86: xc/programs/xclock/ClockP.h,v 1.12 2002/10/21 13:33:08 alanh Exp $ */
+/* $XFree86: xc/programs/xclock/ClockP.h,v 1.11 2002/10/17 01:00:01 dawes Exp $ */
 
 #ifndef _XawClockP_h
 #define _XawClockP_h
diff --git a/XClock-color.ad b/XClock-color.ad
index 95be6cf..d8acb7e 100644
--- a/XClock-color.ad
+++ b/XClock-color.ad
@@ -1,4 +1,4 @@
-! $XFree86: xc/programs/xclock/XClk-col.ad,v 1.2 2003/10/24 20:38:15 tsi Exp $
+! $XFree86$
 
 #include "XClock"
 
diff --git a/xclock.c b/xclock.c
index 98f4a21..9f637db 100644
--- a/xclock.c
+++ b/xclock.c
@@ -29,7 +29,7 @@ Except as contained in this notice, the name of The Open Group shall not be
 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/programs/xclock/xclock.c,v 1.17 2003/12/29 09:10:37 herrb Exp $ */
+/* $XFree86: xclock.c,v 1.16 2002/10/21 13:33:08 alanh Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xclock.man b/xclock.man
index 4945be1..5b68678 100644
--- a/xclock.man
+++ b/xclock.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xclock/xclock.man,v 1.16 2003/07/07 15:34:29 eich Exp $
+.\" $XFree86: xc/programs/xclock/xclock.man,v 1.15 2003/07/04 16:24:30 eich Exp $
 .\"
 .TH XCLOCK 1 __xorgversion__
 .SH NAME