diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:42 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:42 +0000 |
| commit | fb768609ea31ca228c1d97a997bbcb62a496984b (patch) | |
| tree | 50731fff7a4af82c16152ec82b5bc832621a52c5 /src/Speedo/out_blk.c | |
| parent | 9fb403503248fea923533300380cfc4bbb45823a (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XACE-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/Speedo/out_blk.c')
| -rw-r--r-- | src/Speedo/out_blk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Speedo/out_blk.c b/src/Speedo/out_blk.c index e56eb1b..3ecefcc 100644 --- a/src/Speedo/out_blk.c +++ b/src/Speedo/out_blk.c @@ -21,7 +21,7 @@ INCIDENTAL OR CONSEQUENTIAL DAMAGES, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE SPEEDO SOFTWARE OR THE BITSTREAM CHARTER OUTLINE FONT. */ -/* $XFree86: xc/lib/font/Speedo/out_blk.c,v 1.3 2001/01/17 19:43:17 dawes Exp $ */ +/* $XFree86: xc/lib/font/Speedo/out_blk.c,v 1.2 1999/02/07 06:18:16 dawes Exp $ */ /*************************** O U T _ B L K . C ********************************* |