Merging XORG-CURRENT into trunk

This commit is contained in:
Egbert Eich 2004-04-23 18:43:06 +00:00
parent e15f038c34
commit cc2328e654
3 changed files with 3 additions and 3 deletions

View file

@ -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 */

View file

@ -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_

View file

@ -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 */