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 | 052992744eb0958466878cec9041581ce4bcfb2f (patch) | |
| tree | f0f75d6efec6889627484b5f65798142feb5c2ba | |
| parent | 82141c852d890ca247dde30af3ae016f24494d7c (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/calcomp.man | 2 | ||||
| -rw-r--r-- | src/xf86Calcomp.c | 2 | ||||
| -rw-r--r-- | src/xf86Calcomp.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/man/calcomp.man b/man/calcomp.man index 2b025c0..322b1cf 100644 --- a/man/calcomp.man +++ b/man/calcomp.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/calcomp/calcomp.man,v 1.2 2001/08/12 22:51:29 alanh Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/wacom/wacom.man,v 1.2 2001/01/27 18:20:59 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH CALCOMP __drivermansuffix__ __vendorversion__ diff --git a/src/xf86Calcomp.c b/src/xf86Calcomp.c index accbfe3..f71de09 100644 --- a/src/xf86Calcomp.c +++ b/src/xf86Calcomp.c @@ -31,7 +31,7 @@ * authorization from Martin Kroeker or Daveg GmbH. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/calcomp/xf86Calcomp.c,v 1.8 2003/01/15 03:43:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/calcomp/xf86Calcomp.c,v 1.7 2003/01/12 03:55:50 tsi Exp $ */ #define _CALCOMP_C_ /***************************************************************************** diff --git a/src/xf86Calcomp.h b/src/xf86Calcomp.h index a3787fc..fc22747 100644 --- a/src/xf86Calcomp.h +++ b/src/xf86Calcomp.h @@ -26,7 +26,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/calcomp/xf86Calcomp.h,v 1.2 2001/10/28 03:33:55 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/calcomp/xf86Calcomp.h,v 1.1 2001/08/12 22:48:43 alanh Exp $ */ #ifndef _CALCOMP_H_ #define _CALCOMP_H_ |