diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:17 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:17 +0000 |
| commit | bb21849cf15ee14fd7ce80635b606e7d2128ac0c (patch) | |
| tree | 87adb3a233e85764d67e8cd5c09857609db63c10 | |
| parent | ab2be8865ceaa237d2478d291a90419b573cfb65 (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-- | showfont.c | 2 | ||||
| -rw-r--r-- | showfont.man | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -49,7 +49,7 @@ other dealings in this Software without prior written authorization from the X Consortium. */ -/* $XFree86: xc/programs/showfont/showfont.c,v 1.4 2001/08/27 17:41:01 dawes Exp $ */ +/* $XFree86: xc/programs/showfont/showfont.c,v 1.3 2000/02/18 12:20:17 tsi Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/showfont.man b/showfont.man index 43b52a8..93b052b 100644 --- a/showfont.man +++ b/showfont.man @@ -1,5 +1,5 @@ .\" $XConsortium: showfont.man,v 1.3 94/04/11 14:29:57 gildea Exp $ -.\" $XFree86: xc/programs/showfont/showfont.man,v 1.4 2001/01/27 18:21:06 dawes Exp $ +.\" $XFree86: xc/programs/showfont/showfont.man,v 1.3 2000/02/17 14:00:33 dawes Exp $ .TH SHOWFONT 1 __xorgversion__ .SH NAME showfont \- font dumper for X font server |