diff options
author | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:52 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:52 +0000 |
commit | f6db363d39a355cb24398ba531e9f39d0f350c37 (patch) | |
tree | 87adb3a233e85764d67e8cd5c09857609db63c10 | |
parent | ab2be8865ceaa237d2478d291a90419b573cfb65 (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).
-rw-r--r-- | showfont.c | 2 | ||||
-rw-r--r-- | showfont.man | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -49,7 +49,7 @@ other dealings in this Software without prior written authorization from the X Consortium. */ -/* $XFree86: xc/programs/showfont/showfont.c,v 1.4 2001/08/27 17:41:01 dawes Exp $ */ +/* $XFree86: xc/programs/showfont/showfont.c,v 1.3 2000/02/18 12:20:17 tsi Exp $ */ #include <stdio.h> #include <stdlib.h> diff --git a/showfont.man b/showfont.man index 43b52a8..93b052b 100644 --- a/showfont.man +++ b/showfont.man @@ -1,5 +1,5 @@ .\" $XConsortium: showfont.man,v 1.3 94/04/11 14:29:57 gildea Exp $ -.\" $XFree86: xc/programs/showfont/showfont.man,v 1.4 2001/01/27 18:21:06 dawes Exp $ +.\" $XFree86: xc/programs/showfont/showfont.man,v 1.3 2000/02/17 14:00:33 dawes Exp $ .TH SHOWFONT 1 __xorgversion__ .SH NAME showfont \- font dumper for X font server |