summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-12-20 00:28:33 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-12-20 00:28:33 +0000
commitee71467ec896d97b69d5353f0804a65f1aa5a056 (patch)
treef56ea9588e8c7add9b0cc33ce05d2761aaa20c0f
parentf89fab68e29e3a4367e550fa25b75bba433f789d (diff)
merge XFree86 RC2 (4.3.99.902) from vendor branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE
-rw-r--r--Logo.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/Logo.c b/Logo.c
index f4e738a..a9b614e 100644
--- a/Logo.c
+++ b/Logo.c
@@ -1,3 +1,4 @@
+/* $XdotOrg: Logo.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */
/* $Xorg: Logo.c,v 1.4 2001/02/09 02:05:54 xorgcvs Exp $ */
/*
@@ -26,13 +27,14 @@ other dealings in this Software without prior written authorization
from The Open Group.
*/
-/* $XFree86: xc/programs/xlogo/Logo.c,v 1.6 2002/05/23 23:53:59 keithp Exp $ */
+/* $XFree86: xc/programs/xlogo/Logo.c,v 1.7 2003/12/19 02:05:40 dawes Exp $ */
#include <X11/StringDefs.h>
#include <X11/IntrinsicP.h>
#include <X11/Xmu/Drawing.h>
#include "LogoP.h"
#include <X11/extensions/shape.h>
+#include <X11/Xos.h>
#ifdef XRENDER
#include "RenderLogo.h"