From 9f1abf8dfbddf72d0ba84b53a9a90173baaa6d9b Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:40:50 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. 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). --- README.sgml | 2 +- man/mouse.man | 2 +- src/mouse.c | 2 +- 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 @@ 17 December 2002 -$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 $ 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. diff --git a/src/pnp.c b/src/pnp.c index 0ae100f..80dc667 100644 --- a/src/pnp.c +++ b/src/pnp.c @@ -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 * -- cgit v1.2.3