diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:49 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:49 +0000 |
| commit | 91fc47244a0b7ad75da4edaa1926a3e26355b194 (patch) | |
| tree | 52d63fcaa6b9d4ad48b2290c12b491864ece4d37 | |
| parent | 6cf5747580a3293a8ea2ce16213d092c90a162a4 (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-- | fslsfonts.c | 2 | ||||
| -rw-r--r-- | fslsfonts.man | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fslsfonts.c b/fslsfonts.c index 2ca2baf..9760db2 100644 --- a/fslsfonts.c +++ b/fslsfonts.c @@ -43,7 +43,7 @@ in this Software without prior written authorization from The Open Group. * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF * THIS SOFTWARE. */ -/* $XFree86: xc/programs/fslsfonts/fslsfonts.c,v 3.8 2001/12/14 20:00:45 dawes Exp $ */ +/* $XFree86: xc/programs/fslsfonts/fslsfonts.c,v 3.7 2001/08/27 17:41:01 dawes Exp $ */ #include <X11/fonts/FSlib.h> #include <stdio.h> diff --git a/fslsfonts.man b/fslsfonts.man index 2dfb2ad..891aa0e 100644 --- a/fslsfonts.man +++ b/fslsfonts.man @@ -24,7 +24,7 @@ .\" other dealings in this Software without prior written authorization .\" from The Open Group. .\" -.\" $XFree86: xc/programs/fslsfonts/fslsfonts.man,v 1.7 2001/12/14 20:00:45 dawes Exp $ +.\" $XFree86: xc/programs/fslsfonts/fslsfonts.man,v 1.6 2001/01/27 18:21:01 dawes Exp $ .\" .TH FSLSFONTS 1 __xorgversion__ .SH NAME |