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 | c683ea179775618bfc036f6930ca7bc719840f0c (patch) | |
| tree | 58f7f8c7c17b73bd01b075c24fcd83db9d3eb2fb | |
| parent | 7cd4c176e3bd945993d59b9ea073499ab25edef6 (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/citron.man | 2 | ||||
| -rw-r--r-- | src/citron.c | 2 | ||||
| -rw-r--r-- | src/citron.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/man/citron.man b/man/citron.man index 8f291e1..5d4f276 100644 --- a/man/citron.man +++ b/man/citron.man @@ -1,7 +1,7 @@ .\" Copyright (c) 2000-2003 Peter Kunzmann <support@citron.de> .\" $Id$ .\" -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/citron/citron.man,v 1.4 2003/06/24 15:43:40 eich Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/citron/citron.man,v 1.2 2001/01/27 18:20:57 dawes Exp $ .\" .TH CITRON __drivermansuffix__ __vendorversion__ .SH NAME diff --git a/src/citron.c b/src/citron.c index a08e483..259e8e6 100644 --- a/src/citron.c +++ b/src/citron.c @@ -25,7 +25,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/citron/citron.c,v 1.12 2003/11/06 18:38:11 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/citron/citron.c,v 1.11tsi Exp $ */ /* * Based, in part, on code with the following copyright notice: diff --git a/src/citron.h b/src/citron.h index c1c1ec8..e356377 100644 --- a/src/citron.h +++ b/src/citron.h @@ -25,7 +25,7 @@ * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/citron/citron.h,v 1.5 2003/11/03 05:11:47 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/citron/citron.h,v 1.4tsi Exp $ */ /* * Based, in part, on code with the following copyright notice: |