diff options
author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:31:19 +0000 |
---|---|---|
committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-03-17 20:31:19 +0000 |
commit | 15ccb31bed2e06e632becccaad5b0e116d76d3f8 (patch) | |
tree | 0785833327edb66a650c892339abc4701965b30d | |
parent | e74668bfa6605bfed226df2136152de369281020 (diff) |
merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE)CYGWIN-RELEASE-1-MERGECYGWIN-PRE-6_8_0-MERGECYGWIN-HEAD-MERGECYGWIN-HEAD-LAST-MERGE
-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_ |