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 | 5a966388dcb5285c36720598d5b192efc4e59319 (patch) | |
| tree | 971aeff8805763ab3a8399ffc64019eb0cc0e4e5 | |
| parent | b058394c8c71b0d84f512416b19d165f1da57985 (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/fbdev.man | 2 | ||||
| -rw-r--r-- | src/fbdev.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/man/fbdev.man b/man/fbdev.man index f6a6f7d..9291851 100644 --- a/man/fbdev.man +++ b/man/fbdev.man @@ -1,4 +1,4 @@ -.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.man,v 1.3 2001/10/02 15:57:32 alanh Exp $ +.\" $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.man,v 1.2 2001/01/27 18:20:47 dawes Exp $ .\" shorthand for double quote that works everywhere. .ds q \N'34' .TH FBDEV __drivermansuffix__ __vendorversion__ diff --git a/src/fbdev.c b/src/fbdev.c index 2553fff..f531a19 100644 --- a/src/fbdev.c +++ b/src/fbdev.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c,v 1.45 2004/01/11 18:42:59 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/fbdev/fbdev.c,v 1.44 2003/09/24 02:43:21 dawes Exp $ */ /* * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> |