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/fc | |
| 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/fc')
| -rw-r--r-- | src/fc/fsconvert.c | 2 | ||||
| -rw-r--r-- | src/fc/fserve.c | 2 | ||||
| -rw-r--r-- | src/fc/fserve.h | 2 | ||||
| -rw-r--r-- | src/fc/fservestr.h | 2 | ||||
| -rw-r--r-- | src/fc/fsio.c | 2 | ||||
| -rw-r--r-- | src/fc/fsio.h | 2 | ||||
| -rw-r--r-- | src/fc/fslibos.h | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/src/fc/fsconvert.c b/src/fc/fsconvert.c index 6b694fd..84ad901 100644 --- a/src/fc/fsconvert.c +++ b/src/fc/fsconvert.c @@ -22,7 +22,7 @@ * * Author: Dave Lemke, Network Computing Devices, Inc */ -/* $XFree86: xc/lib/font/fc/fsconvert.c,v 1.15 2003/09/01 20:50:43 herrb Exp $ */ +/* $XFree86: xc/lib/font/fc/fsconvert.c,v 1.14 2003/08/30 18:06:29 dawes Exp $ */ /* * FS data conversion */ diff --git a/src/fc/fserve.c b/src/fc/fserve.c index 5b251e0..85a4214 100644 --- a/src/fc/fserve.c +++ b/src/fc/fserve.c @@ -25,7 +25,7 @@ used in advertising or otherwise to promote the sale, use or other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fc/fserve.c,v 3.27 2004/01/12 17:19:30 tsi Exp $ */ +/* $XFree86: xc/lib/font/fc/fserve.c,v 3.26tsi Exp $ */ /* * Copyright 1990 Network Computing Devices diff --git a/src/fc/fserve.h b/src/fc/fserve.h index 9d69257..3254f40 100644 --- a/src/fc/fserve.h +++ b/src/fc/fserve.h @@ -24,7 +24,7 @@ * Author: Dave Lemke, Network Computing Devices, Inc * */ -/* $XFree86: xc/lib/font/fc/fserve.h,v 1.5 2001/04/05 17:42:28 dawes Exp $ */ +/* $XFree86: xc/lib/font/fc/fserve.h,v 1.4 2001/01/17 19:43:29 dawes Exp $ */ #ifndef _FSERVE_H_ #define _FSERVE_H_ diff --git a/src/fc/fservestr.h b/src/fc/fservestr.h index 20c85f6..0e41666 100644 --- a/src/fc/fservestr.h +++ b/src/fc/fservestr.h @@ -23,7 +23,7 @@ * * Author: Dave Lemke, Network Computing Devices, Inc */ -/* $XFree86: xc/lib/font/fc/fservestr.h,v 3.4 2001/07/25 15:04:56 dawes Exp $ */ +/* $XFree86: xc/lib/font/fc/fservestr.h,v 3.3 2001/01/17 19:43:29 dawes Exp $ */ #ifndef _FSERVESTR_H_ #define _FSERVESTR_H_ diff --git a/src/fc/fsio.c b/src/fc/fsio.c index 6f589c8..e5c0c05 100644 --- a/src/fc/fsio.c +++ b/src/fc/fsio.c @@ -23,7 +23,7 @@ * * Author: Dave Lemke, Network Computing Devices, Inc */ -/* $XFree86: xc/lib/font/fc/fsio.c,v 3.17 2003/05/27 22:26:49 tsi Exp $ */ +/* $XFree86: xc/lib/font/fc/fsio.c,v 3.16tsi Exp $ */ /* * font server i/o routines */ diff --git a/src/fc/fsio.h b/src/fc/fsio.h index 974ef4a..2241436 100644 --- a/src/fc/fsio.h +++ b/src/fc/fsio.h @@ -23,7 +23,7 @@ * * Author: Dave Lemke, Network Computing Devices, Inc */ -/* $XFree86: xc/lib/font/fc/fsio.h,v 1.6 2001/01/17 19:43:29 dawes Exp $ */ +/* $XFree86: xc/lib/font/fc/fsio.h,v 1.5 1999/12/30 02:39:06 robin Exp $ */ #ifndef _FSIO_H_ #define _FSIO_H_ diff --git a/src/fc/fslibos.h b/src/fc/fslibos.h index 09f1ade..8d3ff55 100644 --- a/src/fc/fslibos.h +++ b/src/fc/fslibos.h @@ -31,7 +31,7 @@ other dealings in this Software without prior written authorization from The Open Group. */ -/* $XFree86: xc/lib/font/fc/fslibos.h,v 3.9 2003/09/01 20:50:44 herrb Exp $ */ +/* $XFree86: xc/lib/font/fc/fslibos.h,v 3.8 2003/08/29 18:01:14 herrb Exp $ */ /* * FSlib networking & os include file |