diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:04 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:04 +0000 |
| commit | a605709652412785e64decc079e18c3ef0e97fe9 (patch) | |
| tree | 61386058f755ba9c4c2e785cea064be62114ed0c | |
| parent | 11d740de2078d90c2bd130739c7d68f76492e185 (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/aiptek.man | 2 | ||||
| -rw-r--r-- | src/xf86Aiptek.c | 2 | ||||
| -rw-r--r-- | src/xf86Aiptek.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/man/aiptek.man b/man/aiptek.man index 466c871..f2ea668 100644 --- a/man/aiptek.man +++ b/man/aiptek.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/aiptek.man,v 1.1 2003/06/30 16:52:57 eich Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/aiptek.man,v 0.0 2003/03/23 00:00:00 bheadley Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH AIPTEK __drivermansuffix__ __vendorversion__ diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c index 6156fea..1f52f9c 100644 --- a/src/xf86Aiptek.c +++ b/src/xf86Aiptek.c @@ -35,7 +35,7 @@ * TORTIOUS ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.c,v 1.2 2003/12/22 17:48:10 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.c,v 1.1tsi Exp $ */ /* * diff --git a/src/xf86Aiptek.h b/src/xf86Aiptek.h index d6ce76d..c4be89b 100644 --- a/src/xf86Aiptek.h +++ b/src/xf86Aiptek.h @@ -34,8 +34,8 @@ * TORTIOUS ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.h,v 1.3 2003/12/10 01:50:33 dawes Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.h,v 1.3 2003/12/10 01:50:33 dawes Exp $ */ +: /* $XdotOrg: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.h,v 1.3 2003/12/10 01:50:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/aiptek/xf86Aiptek.h,v 1.2 2003/11/03 05:36:32 tsi Exp $ */ #ifndef _AIPTEK_H_ #define _AIPTEK_H_ |