diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:43 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:47:43 +0000 |
| commit | 0418c97ec68009e26944681e5d1b3b0cd5654323 (patch) | |
| tree | 355b32d1bb977d67ab93ebca0755e448b804e421 | |
| parent | 254b501389c55ab8d7c04d778b88a7aef4ed7315 (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/dummy.h | 2 | ||||
| -rw-r--r-- | src/dummy_driver.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dummy.h b/src/dummy.h index edffc4e..2727925 100644 --- a/src/dummy.h +++ b/src/dummy.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy.h,v 1.2 2003/04/23 21:51:35 tsi Exp $ */ +/* $XFree86$ */ /* All drivers should typically include these */ #include "xf86.h" diff --git a/src/dummy_driver.c b/src/dummy_driver.c index 224b9e2..c972ceb 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.6 2003/11/03 05:11:11 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/dummy/dummy_driver.c,v 1.5tsi Exp $ */ /* * Copyright 2002, SuSE Linux AG, Author: Egbert Eich |