summaryrefslogtreecommitdiff
path: root/src/bits2pixels.c
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2004-03-04 17:48:00 +0000
committerEgbert Eich <eich@suse.de>2004-03-04 17:48:00 +0000
commit8bfd5f7bb773c61bbd56e04df7d1563f553bb307 (patch)
tree0bcaf44ccbaea2216d1ad5d1dca0a651cd1e289a /src/bits2pixels.c
parent37d456e499fd76f2b4f2b261183abf6f926bd96c (diff)
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-BASE
a changed license. There was only one change which happened to be from me (Egbert Eich).
Diffstat (limited to 'src/bits2pixels.c')
-rw-r--r--src/bits2pixels.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/bits2pixels.c b/src/bits2pixels.c
index 416a1a7..c08fa79 100644
--- a/src/bits2pixels.c
+++ b/src/bits2pixels.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/bits2pixels.c,v 1.2 2002/12/11 17:07:58 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/bits2pixels.c,v 1.1 2001/04/05 19:29:43 dawes Exp $ */
/* **********************************************************
* Copyright (C) 1999-2001 VMware, Inc.
* All Rights Reserved