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/cir.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/cir.h') diff --git a/src/cir.h b/src/cir.h index 536f7aa..2000c68 100644 --- a/src/cir.h +++ b/src/cir.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir.h,v 1.21 2002/01/25 21:56:01 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/cirrus/cir.h,v 1.20 2002/01/04 21:26:54 tsi Exp $ */ /* (c) Itai Nahshon */ -- cgit v1.2.3