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 | e6079d630262dc4ccd0230c639bacb92b74874cd (patch) | |
| tree | e1cf38a0c417572db1be82fc2b24e2ff18d87952 | |
| parent | 7d3ee7b318425801939c01c9ff8850d5821bc224 (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/mutouch.man | 2 | ||||
| -rw-r--r-- | src/xf86MuTouch.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/man/mutouch.man b/man/mutouch.man index 9660d51..6886a15 100644 --- a/man/mutouch.man +++ b/man/mutouch.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/mutouch/mutouch.man,v 1.2 2001/01/27 18:20:58 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/mutouch/mutouch.man,v 1.1 2001/01/24 00:06:37 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH MUTOUCH __drivermansuffix__ __vendorversion__ diff --git a/src/xf86MuTouch.c b/src/xf86MuTouch.c index 6762034..45a1929 100644 --- a/src/xf86MuTouch.c +++ b/src/xf86MuTouch.c @@ -21,7 +21,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mutouch/xf86MuTouch.c,v 1.14 2001/08/17 13:27:56 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mutouch/xf86MuTouch.c,v 1.13 2001/04/01 14:00:13 tsi Exp $ */ /* ******************************************************************************* |