From fa8a01f1b031f8c9843c565e6fee6422f035345d Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:40:36 +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/ffb_dbe.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ffb_dbe.c') diff --git a/src/ffb_dbe.c b/src/ffb_dbe.c index 09395f7..52b6943 100644 --- a/src/ffb_dbe.c +++ b/src/ffb_dbe.c @@ -21,7 +21,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dbe.c,v 1.2 2003/02/11 03:19:02 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_dbe.c,v 1.1 2000/05/23 04:47:44 dawes Exp $ */ #define NEED_REPLIES #define NEED_EVENTS -- cgit v1.2.3