diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:38:52 +0000 |
| commit | 9a6a831451180326a71dae5f695f49ca12e59819 (patch) | |
| tree | da9b06d5f15a98152cd6ac6a41d608e99fdfab28 | |
| parent | 328700661ba8041a73dd7850a81cd4a31df5b406 (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-- | fontcache.h | 2 | ||||
| -rw-r--r-- | fontcacheP.h | 2 | ||||
| -rw-r--r-- | fontcachstr.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fontcache.h b/fontcache.h index 716905b..b767db1 100644 --- a/fontcache.h +++ b/fontcache.h @@ -27,7 +27,7 @@ * * Id: fontcache.h,v 1.6 1999/01/31 12:41:32 akiyama Exp $ */ -/* $XFree86: xc/include/extensions/fontcache.h,v 1.4 2003/11/17 22:20:03 dawes Exp $ */ +/* $XFree86: xc/include/extensions/fontcache.h,v 1.3 2001/08/01 00:44:35 tsi Exp $ */ /* THIS IS NOT AN X CONSORTIUM STANDARD */ diff --git a/fontcacheP.h b/fontcacheP.h index 000cc5c..75677f3 100644 --- a/fontcacheP.h +++ b/fontcacheP.h @@ -26,7 +26,7 @@ * * Id: fontcacheP.h,v 1.6 1999/01/31 12:43:53 akiyama Exp $ */ -/* $XFree86: xc/include/extensions/fontcacheP.h,v 1.5 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86: xc/include/extensions/fontcacheP.h,v 1.4 2000/03/01 01:04:21 dawes Exp $ */ #ifndef _FONTCACHEP_H_ #define _FONTCACHEP_H_ diff --git a/fontcachstr.h b/fontcachstr.h index d545b2c..eab704e 100644 --- a/fontcachstr.h +++ b/fontcachstr.h @@ -27,7 +27,7 @@ * * Id: fontcachstr.h,v 1.7 1999/01/31 14:58:40 akiyama Exp $ */ -/* $XFree86: xc/include/extensions/fontcachstr.h,v 1.3 2001/08/01 00:44:35 tsi Exp $ */ +/* $XFree86$ */ /* THIS IS NOT AN X CONSORTIUM STANDARD */ |