diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:30 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:30 +0000 |
| commit | 2dcecfcc92fd8dc09385a9941dcf1ba05084be7f (patch) | |
| tree | 8e473c8d564788e429d10c27a3cc91bfef8941d9 | |
| parent | 34c564cf357ec08599437341f1cc5b5822661c33 (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-- | CALLMAP | 2 | ||||
| -rw-r--r-- | README.sgml | 2 | ||||
| -rw-r--r-- | TODO_NOTES | 2 | ||||
| -rw-r--r-- | man/s3virge.man | 2 | ||||
| -rw-r--r-- | src/s3v_rop.h | 2 | ||||
| -rw-r--r-- | src/s3v_shadow.c | 2 | ||||
| -rw-r--r-- | src/s3v_xv.c | 2 |
7 files changed, 7 insertions, 7 deletions
@@ -20,4 +20,4 @@ ChipScreenInit -$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/CALLMAP,v 1.2 1998/11/22 10:37:28 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/CALLMAP,v 1.1 1998/11/01 12:35:58 dawes Exp $ diff --git a/README.sgml b/README.sgml index a85b932..001fa65 100644 --- a/README.sgml +++ b/README.sgml @@ -8,7 +8,7 @@ <date>19 Dec 2001 <ident> -$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/s3virge.sgml,v 1.6 2003/02/13 03:21:33 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/doc/sgml/s3virge.sgml,v 1.5 2001/12/21 21:01:57 dawes Exp $ </ident> <toc> @@ -323,4 +323,4 @@ the new config. management stuff may help here. -$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES,v 1.23 2003/02/13 03:21:33 dawes Exp $ +$XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/TODO_NOTES,v 1.22 2003/02/04 02:20:49 dawes Exp $ diff --git a/man/s3virge.man b/man/s3virge.man index b0120ec..425cd8a 100644 --- a/man/s3virge.man +++ b/man/s3virge.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3virge.man,v 1.4 2003/02/13 03:21:33 dawes Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3virge.man,v 1.3 2001/11/21 22:43:00 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH s3virge __drivermansuffix__ __vendorversion__ diff --git a/src/s3v_rop.h b/src/s3v_rop.h index 11e0bd3..e4b393a 100644 --- a/src/s3v_rop.h +++ b/src/s3v_rop.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_rop.h,v 1.3 1999/03/14 03:22:04 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_rop.h,v 1.2 1998/11/28 10:43:16 dawes Exp $ */ /* Copyright (C) 1994-1998 The XFree86 Project, Inc. All Rights Reserved. diff --git a/src/s3v_shadow.c b/src/s3v_shadow.c index 5522aaf..7499d84 100644 --- a/src/s3v_shadow.c +++ b/src/s3v_shadow.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_shadow.c,v 1.3 2000/03/31 20:13:33 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_shadow.c,v 1.2 2000/03/06 22:59:30 dawes Exp $ */ /* Copyright (C) 1994-2000 The XFree86 Project, Inc. All Rights Reserved. diff --git a/src/s3v_xv.c b/src/s3v_xv.c index 5cf2bb3..e13c792 100644 --- a/src/s3v_xv.c +++ b/src/s3v_xv.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_xv.c,v 1.11 2003/11/10 18:22:25 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/s3virge/s3v_xv.c,v 1.10tsi Exp $ */ /* Copyright (C) 2000 The XFree86 Project, Inc. All Rights Reserved. |