summaryrefslogtreecommitdiff
path: root/src/bitmap/fontink.c
diff options
context:
space:
mode:
authorAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-03-17 20:29:44 +0000
committerAlexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de>2004-03-17 20:29:44 +0000
commit2a71d12399e42aca423cef951ba2e40aaea5134b (patch)
tree0fc7037f8cf2fe6a8cd172d75b6d6fafc1550a96 /src/bitmap/fontink.c
parent4efb75d0a7b7535790f2081d84e5a45cf6554d32 (diff)
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGE
Diffstat (limited to 'src/bitmap/fontink.c')
-rw-r--r--src/bitmap/fontink.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bitmap/fontink.c b/src/bitmap/fontink.c
index 45226c5..c3f5e8c 100644
--- a/src/bitmap/fontink.c
+++ b/src/bitmap/fontink.c
@@ -27,7 +27,7 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/lib/font/bitmap/fontink.c,v 1.7 2001/12/14 19:56:46 dawes Exp $ */
+/* $XFree86: xc/lib/font/bitmap/fontink.c,v 1.6 2001/01/17 19:43:27 dawes Exp $ */
/*
* Author: Keith Packard, MIT X Consortium