From 15ccb31bed2e06e632becccaad5b0e116d76d3f8 Mon Sep 17 00:00:00 2001 From: Alexander Gottwald Date: Wed, 17 Mar 2004 20:31:19 +0000 Subject: merge with XORG-RELEASE-1 (tag XORG-CYGWIN-LAST-MERGE) --- src/spaceorb.c | 2 +- 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_ -- cgit v1.2.3