From 85a4962bf0afd349b3260f68fb29aa06b0117f57 Mon Sep 17 00:00:00 2001
From: Egbert Eich <eich@suse.de>
Date: Fri, 23 Apr 2004 19:54:39 +0000
Subject: Merging XORG-CURRENT into trunk

---
 xclipboard.c   | 2 +-
 xclipboard.man | 2 +-
 xcutsel.c      | 2 +-
 xcutsel.man    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/xclipboard.c b/xclipboard.c
index 15b1568..60be0f8 100644
--- a/xclipboard.c
+++ b/xclipboard.c
@@ -28,7 +28,7 @@ in this Software without prior written authorization from The Open Group.
  * Updated for R4:  Chris D. Peterson,  MIT X Consortium.
  * Reauthored by: Keith Packard, MIT X Consortium.
  */
-/* $XFree86: xc/programs/xclipboard/xclipboard.c,v 1.9 2003/05/27 22:26:59 tsi Exp $ */
+/* $XFree86: xc/programs/xclipboard/xclipboard.c,v 1.8tsi Exp $ */
 
 #include <stdio.h>
 #include <X11/Intrinsic.h>
diff --git a/xclipboard.man b/xclipboard.man
index 933c782..83fa613 100644
--- a/xclipboard.man
+++ b/xclipboard.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xclipboard/xclipboard.man,v 1.9 2002/10/12 16:06:46 herrb Exp $
+.\" $XFree86: xc/programs/xclipboard/xclipboard.man,v 1.8 2001/12/14 20:01:16 dawes Exp $
 .\"
 .TH XCLIPBOARD 1 __xorgversion__
 .SH NAME
diff --git a/xcutsel.c b/xcutsel.c
index 485c867..b844fca 100644
--- a/xcutsel.c
+++ b/xcutsel.c
@@ -26,7 +26,7 @@ in this Software without prior written authorization from The Open Group.
  * *
  * Author:  Ralph Swick, DEC/Project Athena
  */
-/* $XFree86: xc/programs/xclipboard/xcutsel.c,v 1.8 2001/12/14 20:01:16 dawes Exp $ */
+/* $XFree86: xc/programs/xclipboard/xcutsel.c,v 1.7 2001/04/01 14:00:19 tsi Exp $ */
 
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/xcutsel.man b/xcutsel.man
index 09ac0b4..ac8a983 100644
--- a/xcutsel.man
+++ b/xcutsel.man
@@ -23,7 +23,7 @@
 .\" other dealings in this Software without prior written authorization
 .\" from The Open Group.
 .\"
-.\" $XFree86: xc/programs/xclipboard/xcutsel.man,v 1.8 2001/12/14 20:01:16 dawes Exp $
+.\" $XFree86: xc/programs/xclipboard/xcutsel.man,v 1.7 2001/01/27 18:21:09 dawes Exp $
 .\"
 .TH XCUTSEL 1 __xorgversion__
 .SH NAME
-- 
cgit v1.2.3