diff options
author | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:05 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:05 +0000 |
commit | 62e48ab9924c6ca9e346bc255981c2046b347f3d (patch) | |
tree | e3a0dfc2cd4f988957effd20365995f9898ef2ec | |
parent | fb29296f51be68171579607edb43d82898c25f7e (diff) |
18. Merged in XFree86 code up to 4.4.0 including changes to files that had
a changed license. There was only one change which happened to be from
me (Egbert Eich).
-rw-r--r-- | man/kbd.man | 2 | ||||
-rw-r--r-- | man/keyboard.man | 2 | ||||
-rw-r--r-- | src/kbd.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/man/kbd.man b/man/kbd.man index 5719d56..e55ace3 100644 --- a/man/kbd.man +++ b/man/kbd.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.man,v 1.1 2002/10/11 01:40:33 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/keyboard/keyboard.man,v 1.2 2001/01/27 18:20:57 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH KBD __drivermansuffix__ __vendorversion__ diff --git a/man/keyboard.man b/man/keyboard.man index 93a5fd3..0efd096 100644 --- a/man/keyboard.man +++ b/man/keyboard.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/keyboard/keyboard.man,v 1.3 2002/10/11 01:40:33 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/keyboard/keyboard.man,v 1.2 2001/01/27 18:20:57 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH KEYBOARD __drivermansuffix__ __vendorversion__ @@ -1,5 +1,5 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.9 2003/12/18 21:53:45 dawes Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.9 2003/12/18 21:53:45 dawes Exp $ */ +: /* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.9 2003/12/18 21:53:45 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v 1.8 2003/11/03 05:11:47 tsi Exp $ */ /* * Copyright (c) 2002 by The XFree86 Project, Inc. |