diff options
author | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:46 +0000 |
---|---|---|
committer | Egbert Eich <eich@suse.de> | 2004-03-04 17:48:46 +0000 |
commit | 38f37a3854c401f1347b86e1f676d0f62cc30868 (patch) | |
tree | f02406f59bf7a126c6b093fd0b6a70d3d5a251b4 /hw/xfree86/xf8_32bpp/cfbpntwin.c | |
parent | 1f71928430af1fa906bfd6c3afae5656588b5969 (diff) |
18. Merged in XFree86 code up to 4.4.0 including changes to files that had
a changed license. There was only one change which happened to be from
me (Egbert Eich).
Diffstat (limited to 'hw/xfree86/xf8_32bpp/cfbpntwin.c')
-rw-r--r-- | hw/xfree86/xf8_32bpp/cfbpntwin.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/hw/xfree86/xf8_32bpp/cfbpntwin.c b/hw/xfree86/xf8_32bpp/cfbpntwin.c index 65f0b548b..47ffb8f4f 100644 --- a/hw/xfree86/xf8_32bpp/cfbpntwin.c +++ b/hw/xfree86/xf8_32bpp/cfbpntwin.c @@ -1,5 +1,5 @@ -/* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.1.4.2 2004/02/25 21:46:57 kaleb Exp $ */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.5 2001/10/01 13:44:15 eich Exp $ */ +: /* $XdotOrg: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.1.4.2 2004/02/25 21:46:57 kaleb Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbpntwin.c,v 1.1 1999/01/03 03:58:56 dawes Exp $ */ #include "X.h" |