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/builtins | |
| 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/builtins')
| -rw-r--r-- | src/builtins/builtin.h | 2 | ||||
| -rw-r--r-- | src/builtins/dir.c | 2 | ||||
| -rw-r--r-- | src/builtins/file.c | 2 | ||||
| -rw-r--r-- | src/builtins/fonts.c | 2 | ||||
| -rw-r--r-- | src/builtins/fpe.c | 2 | ||||
| -rw-r--r-- | src/builtins/render.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/src/builtins/builtin.h b/src/builtins/builtin.h index caee81c..f29a82c 100644 --- a/src/builtins/builtin.h +++ b/src/builtins/builtin.h @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/builtin.h,v 1.4 2000/02/23 20:29:33 dawes Exp $ */ +/* $XFree86: xc/lib/font/builtins/builtin.h,v 1.3 1999/12/30 02:29:49 robin Exp $ */ #include <X11/Xdefs.h> #include <font.h> diff --git a/src/builtins/dir.c b/src/builtins/dir.c index c657710..52b1958 100644 --- a/src/builtins/dir.c +++ b/src/builtins/dir.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/dir.c,v 1.4 2000/02/23 20:29:33 dawes Exp $ */ +/* $XFree86: xc/lib/font/builtins/dir.c,v 1.3 1999/12/30 02:29:49 robin Exp $ */ #include "builtin.h" diff --git a/src/builtins/file.c b/src/builtins/file.c index 6fcaa79..b5a99bd 100644 --- a/src/builtins/file.c +++ b/src/builtins/file.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/file.c,v 1.4 2000/02/23 20:29:33 dawes Exp $ */ +/* $XFree86: xc/lib/font/builtins/file.c,v 1.3 1999/12/30 02:29:49 robin Exp $ */ #include "builtin.h" diff --git a/src/builtins/fonts.c b/src/builtins/fonts.c index cc7928e..6fef13f 100644 --- a/src/builtins/fonts.c +++ b/src/builtins/fonts.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/fonts.c,v 1.4 2000/02/23 20:29:34 dawes Exp $ */ +/* $XFree86: xc/lib/font/builtins/fonts.c,v 1.3 1999/12/30 02:29:49 robin Exp $ */ #include "builtin.h" diff --git a/src/builtins/fpe.c b/src/builtins/fpe.c index d96fc3d..219d998 100644 --- a/src/builtins/fpe.c +++ b/src/builtins/fpe.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/fpe.c,v 1.4 2000/02/23 20:29:36 dawes Exp $ */ +/* $XFree86: xc/lib/font/builtins/fpe.c,v 1.3 1999/12/30 02:29:51 robin Exp $ */ #include "fntfilst.h" diff --git a/src/builtins/render.c b/src/builtins/render.c index 5f63c66..7e7180e 100644 --- a/src/builtins/render.c +++ b/src/builtins/render.c @@ -22,7 +22,7 @@ * * Author: Keith Packard, SuSE, Inc. */ -/* $XFree86: xc/lib/font/builtins/render.c,v 1.4 2000/02/23 20:29:36 dawes Exp $ */ +/* $XFree86: xc/lib/font/builtins/render.c,v 1.3 1999/12/30 02:29:51 robin Exp $ */ #include "fntfilst.h" #include "builtin.h" |