diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:36 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:36 +0000 |
| commit | c6d7f27cec22655c58f8bf76cc9e4c583db9b320 (patch) | |
| tree | d406de86c9ed99ea115b5efdeb2b5ac1c082d4eb | |
| parent | 8ecd195af068d5a94de8268a6c6ad419e9ed6197 (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-- | xlsatoms.c | 2 | ||||
| -rw-r--r-- | xlsatoms.man | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -25,7 +25,7 @@ in this Software without prior written authorization from The Open Group. * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/xlsatoms/xlsatoms.c,v 1.6 2001/12/14 20:02:08 dawes Exp $ */ +/* $XFree86: xc/programs/xlsatoms/xlsatoms.c,v 1.5 2001/04/01 14:00:23 tsi Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/xlsatoms.man b/xlsatoms.man index b6f9a69..3c3ebb6 100644 --- a/xlsatoms.man +++ b/xlsatoms.man @@ -23,7 +23,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/xlsatoms/xlsatoms.man,v 1.8 2001/12/14 20:02:08 dawes Exp $ +.\" $XFree86: xc/programs/xlsatoms/xlsatoms.man,v 1.7 2001/01/27 18:21:17 dawes Exp $ .\" .TH XLSATOMS 1 __xorgversion__ .SH NAME |