diff options
author | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:13 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:13 +0000 |
commit | dfea6bec2d256b103fa2ff235d1f4c5d847575e7 (patch) | |
tree | 9df15e877668cec46332769264740ab2b5b24f3e /src/bitmap/fontink.c | |
parent | f89c45a5bfa0c138a62df688ebd36b8e24e32793 (diff) |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASE
a changed license. There was only one change which happened to be from
me (Egbert Eich).
Diffstat (limited to 'src/bitmap/fontink.c')
-rw-r--r-- | src/bitmap/fontink.c | 2 |
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 |