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 | 3e18bbb557fb017319a0e83f3fabd89eef9112b0 (patch) | |
| tree | 2e35ba78d99247a78c96d5af2fe45b46c026f2cf | |
| parent | 9ff77e5b7abc7419def5346bd9fbf04842c9cc21 (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/fpit.man | 2 | ||||
| -rw-r--r-- | readme.txt | 2 | ||||
| -rw-r--r-- | src/xf86Fpit.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/man/fpit.man b/man/fpit.man index 049c1c8..6534338 100644 --- a/man/fpit.man +++ b/man/fpit.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/fpit/fpit.man,v 1.1 2002/11/22 03:35:12 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/wacom/wacom.cpp,v 1.9 2000/12/18 00:17:18 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH FPIT __drivermansuffix__ __vendorversion__ @@ -138,4 +138,4 @@ calibration program ! -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/fpit/readme.txt,v 1.2 2002/11/22 03:37:37 dawes Exp $ */ +/* $XFree86$ */ diff --git a/src/xf86Fpit.c b/src/xf86Fpit.c index 076ec33..ec09f0b 100644 --- a/src/xf86Fpit.c +++ b/src/xf86Fpit.c @@ -40,7 +40,7 @@ * PERFORMANCE OF THIS SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/fpit/xf86Fpit.c,v 1.4 2003/11/03 05:11:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/fpit/xf86Fpit.c,v 1.3tsi Exp $ */ #include <xf86Version.h> |