summaryrefslogtreecommitdiff
path: root/src/offscreen_manager.h
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/offscreen_manager.h
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/offscreen_manager.h')
-rw-r--r--src/offscreen_manager.h2
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