diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:51 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:51 +0000 |
| commit | 6d1263e9ba70aa03d7bf48f20029226351d2914e (patch) | |
| tree | 24c486780b88e3a88fa7d68c5c5bdf7f927743c3 | |
| parent | 355ffda76e10f0608bf7685bce1a4aff629ee449 (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/tek4957.man | 2 | ||||
| -rw-r--r-- | src/xf86Tek4957.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/man/tek4957.man b/man/tek4957.man index 9167af4..670dd83 100644 --- a/man/tek4957.man +++ b/man/tek4957.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/tek4957/tek4957.man,v 1.1 2002/11/11 01:18:08 alanh Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/jamstudio/js_x.man,v 0.2 2002/11/09 18:20:59 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH TEK4957 __drivermansuffix__ __vendorversion__ diff --git a/src/xf86Tek4957.c b/src/xf86Tek4957.c index 452a2bb..41ef830 100644 --- a/src/xf86Tek4957.c +++ b/src/xf86Tek4957.c @@ -21,7 +21,7 @@ * TORTIOUS ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/tek4957/xf86Tek4957.c,v 1.1 2002/11/11 01:18:08 alanh Exp $ */ +/* $XFree86$ */ #ifndef XFree86LOADER #include <unistd.h> |