aboutsummaryrefslogtreecommitdiff
path: root/libXext/src/XSecurity.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-11-18 09:29:58 +0100
committermarha <marha@users.sourceforge.net>2013-11-18 09:29:58 +0100
commit72ba71645132923bb8e0b93f7683aef8bc485aa2 (patch)
treebaeaeff7e7ce5bf65f056625b435b8d55d4a04fa /libXext/src/XSecurity.c
parent4d64875593956234795d9947ac1d225e5b110f0f (diff)
parent7c20de6c7fb53ed404d4df0d975328318810ce01 (diff)
downloadvcxsrv-72ba71645132923bb8e0b93f7683aef8bc485aa2.tar.gz
vcxsrv-72ba71645132923bb8e0b93f7683aef8bc485aa2.tar.bz2
vcxsrv-72ba71645132923bb8e0b93f7683aef8bc485aa2.zip
Merge remote-tracking branch 'origin/released'
* origin/released: libXext mesa xkeyboard-config pixman 18 nov 2013 Conflicts: libXext/src/eat.h
Diffstat (limited to 'libXext/src/XSecurity.c')
-rw-r--r--libXext/src/XSecurity.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libXext/src/XSecurity.c b/libXext/src/XSecurity.c
index ab17755c8..73305a381 100644
--- a/libXext/src/XSecurity.c
+++ b/libXext/src/XSecurity.c
@@ -33,7 +33,6 @@ in this Software without prior written authorization from The Open Group.
#include <X11/extensions/extutil.h>
#include <X11/extensions/securproto.h>
#include <X11/extensions/security.h>
-#include "eat.h"
static XExtensionInfo _Security_info_data;
static XExtensionInfo *Security_info = &_Security_info_data;