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 | 44bb75135d3eb12721b4aee30528809b23d3790f (patch) | |
| tree | e9c4cc3072a10cce56a5c853ff6a5900a15ed3e0 | |
| parent | bafceb10676a64045a7cb74bcd4b36a92423ee1b (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/dmc.man | 2 | ||||
| -rw-r--r-- | src/xf86DMC.c | 2 | ||||
| -rw-r--r-- | src/xf86DMC.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/man/dmc.man b/man/dmc.man index f1e3bf1..ac7a069 100644 --- a/man/dmc.man +++ b/man/dmc.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/dmc/dmc.man,v 1.1 2001/08/17 13:27:55 dawes Exp $ +.\" $XFree86$ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH DMC __drivermansuffix__ __vendorversion__ diff --git a/src/xf86DMC.c b/src/xf86DMC.c index bbefc10..f9015ba 100644 --- a/src/xf86DMC.c +++ b/src/xf86DMC.c @@ -35,7 +35,7 @@ * - Make dectection work after restart of X */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/dmc/xf86DMC.c,v 1.3 2003/06/25 18:06:25 eich Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/dmc/xf86DMC.c,v 1.1 2001/08/17 13:27:55 dawes Exp $ */ #define _DMC_C_ diff --git a/src/xf86DMC.h b/src/xf86DMC.h index 588e970..c551015 100644 --- a/src/xf86DMC.h +++ b/src/xf86DMC.h @@ -27,7 +27,7 @@ * in this Software without prior written authorization from Metro Link. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/dmc/xf86DMC.h,v 1.1 2001/08/17 13:27:55 dawes Exp $ */ +/* $XFree86$ */ #ifndef _DMC_H_ #define _DMC_H_ |