diff options
| author | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:44 +0000 |
|---|---|---|
| committer | Egbert Eich <eich@suse.de> | 2004-03-05 13:40:44 +0000 |
| commit | f29b4da0f7342723dcfd65a40ea9c2bbbc2c3d42 (patch) | |
| tree | 0bcaf44ccbaea2216d1ad5d1dca0a651cd1e289a /src/vmwarecurs.c | |
| parent | 37d456e499fd76f2b4f2b261183abf6f926bd96c (diff) | |
23. Merged with XFree86 4.4.0. Added changes that went into infected files.XORG-CURRENT-premerge-release-1XACE-SELINUX-BASEDAMAGE-XFIXES-BASE
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).
Diffstat (limited to 'src/vmwarecurs.c')
| -rw-r--r-- | src/vmwarecurs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/vmwarecurs.c b/src/vmwarecurs.c index 1a7c6eb..23ddc59 100644 --- a/src/vmwarecurs.c +++ b/src/vmwarecurs.c @@ -6,7 +6,7 @@ char rcsId_vmwarecurs[] = "Id: vmwarecurs.c,v 1.5 2001/01/30 23:33:02 bennett Exp $"; #endif -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmwarecurs.c,v 1.11 2003/02/05 12:47:42 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/vmwarecurs.c,v 1.10 2003/02/04 01:39:53 dawes Exp $ */ #include "vmware.h" #include "bits2pixels.h" |