diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:27 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:27 +0000 |
| commit | 064520002b727dbbaae1f0ec25fa73c40b3362d3 (patch) | |
| tree | e8050e0d93e44dd014db4fe8d05ca27c1647fc80 /difs/fonts.c | |
| parent | 7e40c0280141045540a73dbb76f63b6be81db73c (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-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).
Diffstat (limited to 'difs/fonts.c')
| -rw-r--r-- | difs/fonts.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/difs/fonts.c b/difs/fonts.c index 190e276..6665de4 100644 --- a/difs/fonts.c +++ b/difs/fonts.c @@ -46,7 +46,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/xfs/difs/fonts.c,v 3.14 2003/11/08 02:02:07 dawes Exp $ */ +/* $XFree86: xc/programs/xfs/difs/fonts.c,v 3.13 2001/12/14 20:01:34 dawes Exp $ */ #include "FS.h" #include "FSproto.h" |