diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:48 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:48 +0000 |
| commit | 2c5f9d39ff4c3c423e7fb680628dd918dcb14e63 (patch) | |
| tree | 747c31159d27fd397b2f514f5a647b1bd14e637a | |
| parent | 11d740de2078d90c2bd130739c7d68f76492e185 (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-- | man/aiptek.man | 2 | ||||
| -rw-r--r-- | src/xf86Aiptek.c | 2 | ||||
| -rw-r--r-- | src/xf86Aiptek.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/man/aiptek.man b/man/aiptek.man index 466c871..f2ea668 100644 --- a/man/aiptek.man +++ b/man/aiptek.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/aiptek.man,v 1.1 2003/06/30 16:52:57 eich Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/aiptek.man,v 0.0 2003/03/23 00:00:00 bheadley Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH AIPTEK __drivermansuffix__ __vendorversion__ diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c index 6156fea..1f52f9c 100644 --- a/src/xf86Aiptek.c +++ b/src/xf86Aiptek.c @@ -35,7 +35,7 @@ * TORTIOUS ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.c,v 1.2 2003/12/22 17:48:10 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.c,v 1.1tsi Exp $ */ /* * diff --git a/src/xf86Aiptek.h b/src/xf86Aiptek.h index d6ce76d..da6adc3 100644 --- a/src/xf86Aiptek.h +++ b/src/xf86Aiptek.h @@ -35,7 +35,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.h,v 1.3 2003/12/10 01:50:33 dawes Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.h,v 1.3 2003/12/10 01:50:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.h,v 1.2 2003/11/03 05:36:32 tsi Exp $ */ #ifndef _AIPTEK_H_ #define _AIPTEK_H_ |