diff options
author | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:23 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:41:23 +0000 |
commit | 699693ad07df1abab22b4763d89ad055d87ed377 (patch) | |
tree | 56858a1223b6bd9e21dcdf1b2406e7e9e8a36072 | |
parent | 11735a1bbf574693e8f644137611ff6f69bd45d8 (diff) |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.before_20040421_xprint_branch_landingXORG-CURRENT-premerge-release-1XORG-CURRENT-CLOSEDXACE-SELINUX-BASEDAMAGE-XFIXES-BASEXORG-CURRENTXACE-SELINUXDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (Egbert Eich).
-rw-r--r-- | Eyes.c | 2 | ||||
-rw-r--r-- | transform.c | 2 | ||||
-rw-r--r-- | transform.h | 2 | ||||
-rw-r--r-- | xeyes.c | 2 | ||||
-rw-r--r-- | xeyes.man | 2 |
5 files changed, 5 insertions, 5 deletions
@@ -1,5 +1,5 @@ /* $XConsortium: Eyes.c,v 1.28 94/04/17 20:45:22 eswu Exp $ */ -/* $XFree86: xc/programs/xeyes/Eyes.c,v 1.4 2001/08/27 23:35:13 dawes Exp $ */ +/* $XFree86: xc/programs/xeyes/Eyes.c,v 1.3 2001/07/25 15:05:21 dawes Exp $ */ /* Copyright (c) 1991 X Consortium diff --git a/transform.c b/transform.c index 9495790..be4896c 100644 --- a/transform.c +++ b/transform.c @@ -1,7 +1,7 @@ /* * transformed coordinate system objects for X */ -/* $XFree86: xc/programs/xeyes/transform.c,v 1.4 2001/08/27 23:35:13 dawes Exp $ */ +/* $XFree86: xc/programs/xeyes/transform.c,v 1.3 2000/02/17 14:00:35 dawes Exp $ */ # include <X11/Xos.h> # include <stdlib.h> diff --git a/transform.h b/transform.h index b22620d..5bd5182 100644 --- a/transform.h +++ b/transform.h @@ -2,7 +2,7 @@ * header file for transformed coordinate system. No rotations * supported, as elipses cannot be rotated in X. */ -/* $XFree86: xc/programs/xeyes/transform.h,v 1.3 2000/02/17 14:00:35 dawes Exp $ */ +/* $XFree86$ */ typedef struct _transform { double mx, bx; @@ -28,7 +28,7 @@ other dealings in this Software without prior written authorization from the X Consortium. */ -/* $XFree86: xc/programs/xeyes/xeyes.c,v 1.4 2001/08/27 23:35:13 dawes Exp $ */ +/* $XFree86: xc/programs/xeyes/xeyes.c,v 1.3 2000/02/17 14:00:35 dawes Exp $ */ #include <X11/Intrinsic.h> #include <X11/StringDefs.h> @@ -1,6 +1,6 @@ .\" $XConsortium: xeyes.man,v 1.12 94/04/17 20:45:24 gildea Exp $ .\" -.\" $XFree86: xc/programs/xeyes/xeyes.man,v 1.4 2003/05/29 21:48:11 herrb Exp $ +.\" $XFree86: xc/programs/xeyes/xeyes.man,v 1.3 2001/01/27 18:21:12 dawes Exp $ .\" .TH XEYES 1 __xorgversion__ .SH NAME |