diff options
author | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:55 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:55 +0000 |
commit | c8b444720788e092e0a993502fe6949c8724fc87 (patch) | |
tree | 772ea7b001a3f94aa77b022f9adb6b625d710eac /font.c | |
parent | b3991b421530035674beaccb7e7f9a7a4c302326 (diff) |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadxo-6_7_0XPRINT_BEGINXPRINT_BASEXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEXORG-RELEASE-1-STSF-FORKXORG-RELEASE-1-MERGEXORG-CYGWIN-MERGEXORG-CYGWIN-LAST-MERGEXORG-6_7_0IPv6-REVIEW-BASEXPRINTXORG-RELEASE-1-TMXORG-RELEASE-1-STSFXORG-RELEASE-1IPv6-REVIEW
a changed license. There was only one change which happened to be from
me (Egbert Eich).
Diffstat (limited to 'font.c')
-rw-r--r-- | font.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3,7 +3,7 @@ * * map dvi fonts to X fonts */ -/* $XFree86: xc/programs/xditview/font.c,v 1.6 2002/06/19 20:09:19 keithp Exp $ */ +/* $XFree86: xc/programs/xditview/font.c,v 1.5 2001/08/27 23:35:12 dawes Exp $ */ #include <X11/Xos.h> #include <X11/IntrinsicP.h> |