summaryrefslogtreecommitdiff
path: root/src/fontfile/fontdir.c
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/fontfile/fontdir.c
parent8ee2a19ff0295d625baf0b42e0a8bb7f4ad575fd (diff)
Merging XORG-CURRENT into trunk
Diffstat (limited to 'src/fontfile/fontdir.c')
-rw-r--r--src/fontfile/fontdir.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/fontfile/fontdir.c b/src/fontfile/fontdir.c
index b558c70..024ec03 100644
--- a/src/fontfile/fontdir.c
+++ b/src/fontfile/fontdir.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: fontdir.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
/* $Xorg: fontdir.c,v 1.4 2001/02/09 02:04:03 xorgcvs Exp $ */
/*
@@ -25,7 +26,7 @@ used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from The Open Group.
*/
-/* $XFree86: xc/lib/font/fontfile/fontdir.c,v 3.23 2003/12/02 19:50:40 dawes Exp $ */
+/* $XFree86: xc/lib/font/fontfile/fontdir.c,v 3.22 2003/07/07 16:40:11 eich Exp $ */
/*
* Author: Keith Packard, MIT X Consortium