diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:22 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:39:22 +0000 |
| commit | e0a143e3513de236c758afa319ff5cdb94f3d151 (patch) | |
| tree | 7e82a326d278bd433ae38f7267b109133147441b | |
| parent | 7d25c80475aaa6effc69d058a82523f2c04586ab (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-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).
| -rw-r--r-- | man/Xfontcache.man | 2 | ||||
| -rw-r--r-- | src/FontCache.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/man/Xfontcache.man b/man/Xfontcache.man index d238738..1bb5cf7 100644 --- a/man/Xfontcache.man +++ b/man/Xfontcache.man @@ -1,5 +1,5 @@ .\" -.\" $XFree86: xc/lib/Xfontcache/Xfontcache.man,v 1.1 2003/10/13 21:50:23 herrb Exp $ +.\" $XFree86: xc/lib/Xfontcache/Xfontcache.man,v 1.1 2003/10/13 21:19:28 herrb Exp $ .\" .\" Copyright (C) 2003 The XFree86 Project, Inc. All Rights Reserved. .\" diff --git a/src/FontCache.c b/src/FontCache.c index a97aae1..7561f66 100644 --- a/src/FontCache.c +++ b/src/FontCache.c @@ -27,7 +27,7 @@ * * Id: FontCache.c,v 1.8 1999/01/31 12:52:49 akiyama Exp $ */ -/* $XFree86: xc/lib/Xfontcache/FontCache.c,v 1.4 2003/10/15 22:05:14 herrb Exp $ */ +/* $XFree86: FontCache.c,v 1.3 2002/10/16 00:37:28 dawes Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD */ |