diff options
author | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:06 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-04-23 18:43:06 +0000 |
commit | cc2328e65469115c32617c2c7434e5110e383d4c (patch) | |
tree | da9b06d5f15a98152cd6ac6a41d608e99fdfab28 | |
parent | e15f038c34265c2f984be29b4323786362f3724e (diff) |
Merging XORG-CURRENT into trunksco_port_update-baserel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_99_903XORG-6_8_99_902XORG-6_8_99_901XORG-6_8_99_900XORG-6_8_99_9XORG-6_8_99_8XORG-6_8_99_7XORG-6_8_99_6XORG-6_8_99_5XORG-6_8_99_4XORG-6_8_99_3XORG-6_8_99_2XORG-6_8_99_16XORG-6_8_99_15XORG-6_8_99_14XORG-6_8_99_13XORG-6_8_99_12XORG-6_8_99_11XORG-6_8_99_10XORG-6_8_99_1XORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XACE-SELINUX-MERGEXORG-6_8-branch
-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 */ |