summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:48:04 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:48:04 +0000
commitd79f5c3f0589a238549658f7b6ac96b769211c1b (patch)
tree92a04fec0bf60be7d606327071e07671d9a38005
parente9dd015afc9b974dcc14253df8c819bb08f6be1e (diff)
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW
a changed license. There was only one change which happened to be from me (Egbert Eich).
-rw-r--r--man/acecad.man2
-rw-r--r--src/acecad.c2
-rw-r--r--src/acecad.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/man/acecad.man b/man/acecad.man
index 0f89967..20f60c5 100644
--- a/man/acecad.man
+++ b/man/acecad.man
@@ -1,4 +1,4 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/acecad/acecad.man,v 1.1 2001/08/13 19:35:00 dawes Exp $
+.\" $XFree86$
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH ACECAD __drivermansuffix__ __vendorversion__
diff --git a/src/acecad.c b/src/acecad.c
index f0e3e2d..cd32ac9 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -23,7 +23,7 @@
*
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/acecad/acecad.c,v 1.5 2003/11/05 20:56:29 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/acecad/acecad.c,v 1.4 2003/10/30 00:40:45 dawes Exp $ */
#define _ACECAD_C_
/*****************************************************************************
diff --git a/src/acecad.h b/src/acecad.h
index ef4431b..efb7bfb 100644
--- a/src/acecad.h
+++ b/src/acecad.h
@@ -23,7 +23,7 @@
*
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/acecad/acecad.h,v 1.3 2003/11/06 18:38:11 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/input/acecad/acecad.h,v 1.2tsi Exp $ */
#ifndef _ACECAD_H_
#define _ACECAD_H_