diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-18 09:29:58 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-18 09:29:58 +0100 |
| commit | 72ba71645132923bb8e0b93f7683aef8bc485aa2 (patch) | |
| tree | baeaeff7e7ce5bf65f056625b435b8d55d4a04fa /libXext/src/XShape.c | |
| parent | 4d64875593956234795d9947ac1d225e5b110f0f (diff) | |
| parent | 7c20de6c7fb53ed404d4df0d975328318810ce01 (diff) | |
| download | vcxsrv-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/XShape.c')
| -rw-r--r-- | libXext/src/XShape.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libXext/src/XShape.c b/libXext/src/XShape.c index d02502004..15d754f44 100644 --- a/libXext/src/XShape.c +++ b/libXext/src/XShape.c @@ -36,7 +36,6 @@ in this Software without prior written authorization from The Open Group. #include <X11/extensions/shape.h> #include <X11/extensions/shapeproto.h> #include <limits.h> -#include "eat.h" static XExtensionInfo _shape_info_data; static XExtensionInfo *shape_info = &_shape_info_data; |