diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:16 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:16 +0000 |
| commit | 89549e5a6b08ecaee3687acbf381a2ab45e12349 (patch) | |
| tree | e79b264d9e50c9b86ddcc52b4ba49359ee307e44 | |
| parent | 647b324a5824028cb7979b261d80d5c420a30af3 (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-- | listres.c | 2 | ||||
| -rw-r--r-- | listres.man | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -27,7 +27,7 @@ in this Software without prior written authorization from the X Consortium. * * * Author: Jim Fulton, MIT X Consortium */ -/* $XFree86: xc/programs/listres/listres.c,v 1.4 2001/04/01 14:00:18 tsi Exp $ */ +/* $XFree86: xc/programs/listres/listres.c,v 1.3 2000/02/17 14:00:32 dawes Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/listres.man b/listres.man index 595e1c1..263c00a 100644 --- a/listres.man +++ b/listres.man @@ -25,7 +25,7 @@ .\" other dealings in this Software without prior written authorization .\" from the X Consortium. .\" -.\" $XFree86: xc/programs/listres/listres.man,v 1.4 2003/03/19 01:49:28 dawes Exp $ +.\" $XFree86: xc/programs/listres/listres.man,v 1.3 2001/01/27 18:21:04 dawes Exp $ .\" .TH LISTRES 1 __xorgversion__ .SH NAME |