summaryrefslogtreecommitdiff
path: root/src/fontcache/fontcache.h
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-04-23 18:44:23 +0000
committerEgbert Eich <eich@suse.de>2004-04-23 18:44:23 +0000
commit3d75ea33ecf80c3539b38a993092cd16325a9525 (patch)
tree2c833d7262e8c8e52b052930b7cef9053abf1943 /src/fontcache/fontcache.h
parent8ee2a19ff0295d625baf0b42e0a8bb7f4ad575fd (diff)
Merging XORG-CURRENT into trunk
Diffstat (limited to 'src/fontcache/fontcache.h')
-rw-r--r--src/fontcache/fontcache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/fontcache/fontcache.h b/src/fontcache/fontcache.h
index 3a10b9f..713b314 100644
--- a/src/fontcache/fontcache.h
+++ b/src/fontcache/fontcache.h
@@ -26,7 +26,7 @@
*
* Id: fontcache.h,v 1.12 1999/01/09 06:24:30 akiyama Exp $
*/
-/* $XFree86: xc/lib/font/fontcache/fontcache.h,v 1.7 2003/01/26 03:02:19 dawes Exp $ */
+/* $XFree86: xc/lib/font/fontcache/fontcache.h,v 1.6 2002/11/08 00:46:27 alanh Exp $ */
#ifndef _FONTCACHE_H_
#define _FONTCACHE_H_