summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:47:43 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:47:43 +0000
commit010b0aa643315b3bd62c85fb55c8007dc9310391 (patch)
tree971aeff8805763ab3a8399ffc64019eb0cc0e4e5
parentb058394c8c71b0d84f512416b19d165f1da57985 (diff)
downloadxorg-driver-xf86-video-fbdev-IPv6-REVIEW.tar.gz
18. Merged in XFree86 code up to 4.4.0 including changes to files that hadXPRINT_BASEXORG-RELEASE-1-TM-MERGEXORG-RELEASE-1-TM-BASEIPv6-REVIEW-BASEIPv6-REVIEW
a changed license. There was only one change which happened to be from me (Egbert Eich).
-rw-r--r--man/fbdev.man2
-rw-r--r--src/fbdev.c2
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>