From 7bf8e9d736765001111e3245da36817a5a42dd12 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:40:22 +0000 Subject: 23. Merged with XFree86 4.4.0. Added changes that went into infected files. 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). --- src/alp_xaa.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/alp_xaa.c') diff --git a/src/alp_xaa.c b/src/alp_xaa.c index 417f816..bbdf735 100644 --- a/src/alp_xaa.c +++ b/src/alp_xaa.c @@ -1,6 +1,6 @@ /* (c) Itai Nahshon */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaa.c,v 1.8 2002/01/25 21:56:00 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/alp_xaa.c,v 1.7 2001/10/01 13:44:05 eich Exp $ */ #include "xf86.h" #include "xf86_OSproc.h" -- cgit v1.2.3