From 699693ad07df1abab22b4763d89ad055d87ed377 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:41:23 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. 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). --- Eyes.c | 2 +- transform.c | 2 +- transform.h | 2 +- xeyes.c | 2 +- xeyes.man | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Eyes.c b/Eyes.c index 71c3c26..181d794 100644 --- a/Eyes.c +++ b/Eyes.c @@ -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 # include 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; diff --git a/xeyes.c b/xeyes.c index a78cea1..24b36b0 100644 --- a/xeyes.c +++ b/xeyes.c @@ -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 #include diff --git a/xeyes.man b/xeyes.man index 3b2d22c..0d74d7e 100644 --- a/xeyes.man +++ b/xeyes.man @@ -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 -- cgit v1.2.3