diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:36 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:36 +0000 |
| commit | 83f5343c9184bc11472a538b488004c268d62635 (patch) | |
| tree | 319284e13ed75eaa389c31356b1d6d3130d0f3c7 | |
| parent | 104628fee1fa3289245b951f1a1062622ab49849 (diff) | |
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-TM-CYGWIN-MERGEXORG-TM-CYGWIN-LAST-MERGEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-CLOSEDXORG-RELEASE-1-TM-BASEXORG-RELEASE-1-STSF-FORKXORG-CYGWIN-LAST-MERGEIPv6-REVIEW-BASEXORG-RELEASE-1-TMXORG-RELEASE-1-STSFIPv6-REVIEW
a changed license. There was only one change which happened to be from
me (Egbert Eich).
| -rw-r--r-- | src/ark.h | 2 | ||||
| -rw-r--r-- | src/ark_accel.c | 2 | ||||
| -rw-r--r-- | src/ark_driver.c | 2 | ||||
| -rw-r--r-- | src/ark_reg.h | 2 |
4 files changed, 4 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.3 2002/01/25 21:55:56 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark.h,v 1.2 2001/01/29 15:15:44 keithp Exp $ */ /* * ark */ diff --git a/src/ark_accel.c b/src/ark_accel.c index 11b478c..9b68479 100644 --- a/src/ark_accel.c +++ b/src/ark_accel.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c,v 1.7 2002/12/11 17:09:39 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_accel.c,v 1.6 2002/01/25 21:55:56 tsi Exp $ */ /* * Copyright 2000 Ani Joshi <ajoshi@unixbox.com> * diff --git a/src/ark_driver.c b/src/ark_driver.c index 6399b99..2d916f2 100644 --- a/src/ark_driver.c +++ b/src/ark_driver.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c,v 1.23 2003/09/24 02:43:18 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_driver.c,v 1.22 2003/08/23 15:02:53 dawes Exp $ */ /* * Copyright 2000 Ani Joshi <ajoshi@unixbox.com> * diff --git a/src/ark_reg.h b/src/ark_reg.h index 91a9301..727dbdf 100644 --- a/src/ark_reg.h +++ b/src/ark_reg.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_reg.h,v 1.2 2002/01/04 21:05:51 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ark/ark_reg.h,v 1.1 2000/11/14 17:28:13 dawes Exp $ */ #ifndef _ARK_REG_H #define _ARK_REG_H |