diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:50 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:50 +0000 |
| commit | ddbb0acd05a615370c1058b8206cd79293e8d6c2 (patch) | |
| tree | 62c53d70052319e49a912ea903ea2d1e1ceb579c | |
| parent | 0010c7d5bf893f18f6bae52b58229a5ae1557a9b (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-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-- | src/magellan.c | 2 | ||||
| -rw-r--r-- | src/magellan.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/magellan.c b/src/magellan.c index 5554a70..329933d 100644 --- a/src/magellan.c +++ b/src/magellan.c @@ -32,7 +32,7 @@ * port based on pre-XFree4.2.0 driver code v1.10 and XFree4.2.0 SpaceOrb driver code */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/magellan/magellan.c,v 1.11 2002/06/07 21:03:27 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/magellan/magellan.c,v 1.10 2001/11/26 16:25:53 dawes Exp $ */ #define _MAGELLAN_C_ /***************************************************************************** diff --git a/src/magellan.h b/src/magellan.h index 4fbf4aa..88ac77e 100644 --- a/src/magellan.h +++ b/src/magellan.h @@ -24,7 +24,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/magellan/magellan.h,v 1.4 2002/06/07 21:03:27 alanh Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/magellan/magellan.h,v 1.3 1999/05/15 12:10:30 dawes Exp $ */ #ifndef _MAGELLAN_H_ #define _MAGELLAN_H_ |