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/offscreen_manager.h | |
| 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/offscreen_manager.h')
| -rw-r--r-- | src/offscreen_manager.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/offscreen_manager.h b/src/offscreen_manager.h index e948da9..27d97a7 100644 --- a/src/offscreen_manager.h +++ b/src/offscreen_manager.h @@ -2,7 +2,7 @@ * Copyright (C) 1998-2002 VMware, Inc. * All Rights Reserved * **********************************************************/ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/offscreen_manager.h,v 1.2 2002/12/11 17:07:58 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/vmware/offscreen_manager.h,v 1.1 2002/12/10 04:17:19 dawes Exp $ */ #ifndef OFFSCREEN_MANAGER_H #define OFFSCREEN_MANAGER_H |