diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:46:54 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:46:54 +0000 |
| commit | fff396977b0bdcc94349173ec5fafaa5cbcf6910 (patch) | |
| tree | 7e82a326d278bd433ae38f7267b109133147441b | |
| parent | 7d25c80475aaa6effc69d058a82523f2c04586ab (diff) | |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW
a changed license. There was only one change which happened to be from
me (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 */ |