From f29b4da0f7342723dcfd65a40ea9c2bbbc2c3d42 Mon Sep 17 00:00:00 2001 From: Egbert Eich Date: Fri, 5 Mar 2004 13:40:44 +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/bits2pixels.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/bits2pixels.h') diff --git a/src/bits2pixels.h b/src/bits2pixels.h index 585f6fc..a337902 100644 --- a/src/bits2pixels.h +++ b/src/bits2pixels.h @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/bits2pixels.h,v 1.2 2002/12/11 17:07:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/bits2pixels.h,v 1.1 2001/04/05 19:29:44 dawes Exp $ */ /* ********************************************************** * Copyright (C) 1999-2001 VMware, Inc. * All Rights Reserved -- cgit v1.2.3