diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:47 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:47 +0000 |
commit | 48a0c8946e022fb3c54ffad68a7268f9bbf3a159 (patch) | |
tree | e1c3fd2c9a6a253fd8af108a5f32cb08636ba543 | |
parent | 4b875cfb4290fd28660f450b25481acaa6d94c49 (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-- | screen8x16.bdf | 2 | ||||
-rw-r--r-- | screen8x16b.bdf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/screen8x16.bdf b/screen8x16.bdf index b5b676d..0ca6155 100644 --- a/screen8x16.bdf +++ b/screen8x16.bdf @@ -1,6 +1,6 @@ STARTFONT 2.1 COMMENT Changes 2000 by Serge Winitzki. -COMMENT $XFree86: xc/fonts/bdf/cyrillic/screen8x16.bdf,v 1.1 2002/12/15 01:49:07 dawes Exp $ +COMMENT $XFree86$ FONT -Screen-Fixed-Medium-R-Normal--16-120-100-100-C-80-KOI8-R SIZE 12 100 100 FONTBOUNDINGBOX 8 16 0 -2 diff --git a/screen8x16b.bdf b/screen8x16b.bdf index 06e4627..dcb30ac 100644 --- a/screen8x16b.bdf +++ b/screen8x16b.bdf @@ -1,6 +1,6 @@ STARTFONT 2.1 COMMENT Changes 2000 by Serge Winitzki. -COMMENT $XFree86: xc/fonts/bdf/cyrillic/screen8x16b.bdf,v 1.1 2002/12/15 01:49:07 dawes Exp $ +COMMENT $XFree86$ FONT -Screen-Fixed-Bold-R-Normal--16-120-100-100-C-80-KOI8-R SIZE 12 100 100 FONTBOUNDINGBOX 8 16 0 -2 |