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 | 9f1abf8dfbddf72d0ba84b53a9a90173baaa6d9b (patch) | |
| tree | bd30a9cce91158d0290b7f9038b3b0d66ef384c4 | |
| parent | 88907112c4e98d470b9ad174ae27b390e473f5a1 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XACE-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-- | README.sgml | 2 | ||||
| -rw-r--r-- | man/mouse.man | 2 | ||||
| -rw-r--r-- | src/mouse.c | 2 | ||||
| -rw-r--r-- | src/pnp.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/README.sgml b/README.sgml index 88c647c..6b8f626 100644 --- a/README.sgml +++ b/README.sgml @@ -8,7 +8,7 @@ <date>17 December 2002 <ident> -$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/mouse.sgml,v 1.13 2002/12/17 20:55:22 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/mouse.sgml,v 1.12 2002/02/22 21:45:13 dawes Exp $ </ident> <toc> diff --git a/man/mouse.man b/man/mouse.man index 0b2dac1..4316f3a 100644 --- a/man/mouse.man +++ b/man/mouse.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.man,v 1.7 2003/05/29 21:48:10 herrb Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.man,v 1.6 2003/04/03 22:18:31 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH MOUSE __drivermansuffix__ __vendorversion__ diff --git a/src/mouse.c b/src/mouse.c index 53924f1..437d6cc 100644 --- a/src/mouse.c +++ b/src/mouse.c @@ -1,5 +1,5 @@ /* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c,v 1.80 2003/12/08 23:49:42 dawes Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c,v 1.80 2003/12/08 23:49:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/mouse.c,v 1.79 2003/11/03 05:11:48 tsi Exp $ */ /* * * Copyright 1990,91 by Thomas Roell, Dinkelscherben, Germany. @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/pnp.c,v 1.21 2003/11/03 05:11:49 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/mouse/pnp.c,v 1.20tsi Exp $ */ /* * Copyright 1998 by Kazutaka YOKOTA <yokota@zodiac.mech.utsunomiya-u.ac.jp> * |