diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:22 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:22 +0000 |
| commit | c83d0872339e07480b37d186efcd9f5bb8ee1299 (patch) | |
| tree | 355b32d1bb977d67ab93ebca0755e448b804e421 | |
| parent | 254b501389c55ab8d7c04d778b88a7aef4ed7315 (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASEDAMAGE-XFIXES
Reverted darwin/bundle/**/Credits.rtf to XFree86 versions to avoid
future conflicts on ASCII but not humal readable files. (There should
probably be separate CreditsXorg.rtf files) (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 |