diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:06 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:06 +0000 |
| commit | 871304ba3ea3559a0fef478ef7204acfc5ee5532 (patch) | |
| tree | 0785833327edb66a650c892339abc4701965b30d | |
| parent | e74668bfa6605bfed226df2136152de369281020 (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-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEXORG-RELEASE-1-STSF-FORKXORG-CYGWIN-LAST-MERGEIPv6-REVIEW-BASEXORG-RELEASE-1-TMXORG-RELEASE-1-STSFIPv6-REVIEW
a changed license. There was only one change which happened to be from
me (Egbert Eich).
| -rw-r--r-- | src/spaceorb.c | 2 | ||||
| -rw-r--r-- | src/spaceorb.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/spaceorb.c b/src/spaceorb.c index 1c584d0..8bc56a8 100644 --- a/src/spaceorb.c +++ b/src/spaceorb.c @@ -24,7 +24,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/spaceorb/spaceorb.c,v 1.13 2001/11/26 16:25:54 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/spaceorb/spaceorb.c,v 1.12 2001/10/28 03:33:58 tsi Exp $ */ #define _SPACEORB_C_ /***************************************************************************** diff --git a/src/spaceorb.h b/src/spaceorb.h index 313d7eb..a1e2ad4 100644 --- a/src/spaceorb.h +++ b/src/spaceorb.h @@ -26,7 +26,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/spaceorb/spaceorb.h,v 1.4 2001/10/28 03:33:58 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/spaceorb/spaceorb.h,v 1.3 2000/08/11 19:10:47 dawes Exp $ */ #ifndef _SPACEORB_H_ #define _SPACEORB_H_ |