diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:18 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:18 +0000 |
commit | 081f037e5669ba32ccf0a9cbe9e4f12c399297f6 (patch) | |
tree | bdf3b5fa94398757296b2ae4d101b29d1023fac5 | |
parent | 4d39b9af0d6bf215ca33f9d4a922650be580997f (diff) |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTXACE-SELINUXDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
-rw-r--r-- | xclipboard.c | 2 | ||||
-rw-r--r-- | xclipboard.man | 2 | ||||
-rw-r--r-- | xcutsel.c | 2 | ||||
-rw-r--r-- | 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 @@ -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 |