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 | 5363c29f6035428a84a19a2d4cc2bb705286d997 (patch) | |
| tree | a8302e7003e06a165864991b4dca9ce6aa3722c5 | |
| parent | f680e23cbef4224c8c3c1b2f36719e7f54d60eee (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/microtouch.man | 2 | ||||
| -rw-r--r-- | src/microtouch.c | 2 | ||||
| -rw-r--r-- | src/microtouch.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/man/microtouch.man b/man/microtouch.man index af1a467..dd4be74 100644 --- a/man/microtouch.man +++ b/man/microtouch.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.man,v 1.2 2001/01/27 18:20:58 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.man,v 1.1 2001/01/24 00:06:36 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH MICROTOUCH __drivermansuffix__ __vendorversion__ diff --git a/src/microtouch.c b/src/microtouch.c index e17ca99..29dd853 100644 --- a/src/microtouch.c +++ b/src/microtouch.c @@ -48,7 +48,7 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.c,v 1.12 2000/08/11 19:10:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.c,v 1.11 1999/08/28 10:43:36 dawes Exp $ */ #define _microtouch_C_ /***************************************************************************** diff --git a/src/microtouch.h b/src/microtouch.h index 696b12e..5542859 100644 --- a/src/microtouch.h +++ b/src/microtouch.h @@ -24,7 +24,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.h,v 1.4 2000/03/03 20:36:41 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/microtouch/microtouch.h,v 1.3 1999/08/28 09:01:17 dawes Exp $ */ #ifndef _microtouch_H_ #define _microtouch_H_ |