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 | 6767e128cb7193f9a80aa6fd6084340bd752e11b (patch) | |
| tree | 61731aee27739c1544d3f5d5f8a36f2914af9e2a | |
| parent | c5aeaa75075f2bace017bd6a55384f5bb8766eab (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-- | man/glide.man | 2 | ||||
| -rw-r--r-- | src/glide_driver.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/man/glide.man b/man/glide.man index bf3e78f..3e5795c 100644 --- a/man/glide.man +++ b/man/glide.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glide/glide.man,v 1.3 2001/02/07 22:51:56 tsi Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glide/glide.man,v 1.2 2001/01/27 18:20:47 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH GLIDE __drivermansuffix__ __vendorversion__ diff --git a/src/glide_driver.c b/src/glide_driver.c index 230c34c..52a0eff 100644 --- a/src/glide_driver.c +++ b/src/glide_driver.c @@ -45,7 +45,7 @@ * Support static loading. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c,v 1.28 2002/01/04 21:22:30 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c,v 1.27 2001/08/07 07:04:46 keithp Exp $ */ #include "xaa.h" #include "xf86Cursor.h" |