diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:41 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:41 +0000 |
| commit | 10a574ee13244352968bbe53a6622ffa31d98fa5 (patch) | |
| tree | cbe32e20196a3f7152f105c6a2a0ab82b24e0c45 /src/fontenc.c | |
| parent | 0b1b9f59f2513f5e2795cba34c747b0e68f4b9b1 (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-BASE
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).
Diffstat (limited to 'src/fontenc.c')
| -rw-r--r-- | src/fontenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fontenc.c b/src/fontenc.c index 0bf69e2..4636512 100644 --- a/src/fontenc.c +++ b/src/fontenc.c @@ -21,7 +21,7 @@ THE SOFTWARE. */ /* $XdotOrg: xc/lib/font/fontfile/fontenc.c,v 1.16 2003/12/19 02:05:38 dawes Exp $ */ -/* $XFree86: xc/lib/font/fontfile/fontenc.c,v 1.16 2003/12/19 02:05:38 dawes Exp $ */ +/* $XFree86: xc/lib/font/fontfile/fontenc.c,v 1.15 2003/02/20 03:25:19 dawes Exp $ */ /* Backend-independent encoding code */ |