diff options
| author | marha <marha@users.sourceforge.net> | 2014-08-11 21:22:25 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-08-11 21:22:25 +0200 |
| commit | 8e27619ab489dece35cc4bec86950ee7729cd309 (patch) | |
| tree | ab59dbc661e00c12ed4777cf9d0d37393c4163aa /xorg-server/hw/xwayland/xwayland.h | |
| parent | ffc99ce2402fe5c9a6eb8fcf193e8e9472fd993b (diff) | |
| parent | fdbedba4d50e1b28b0249c83ba11c029f096e400 (diff) | |
| download | vcxsrv-8e27619ab489dece35cc4bec86950ee7729cd309.tar.gz vcxsrv-8e27619ab489dece35cc4bec86950ee7729cd309.tar.bz2 vcxsrv-8e27619ab489dece35cc4bec86950ee7729cd309.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libxcb/src/c_client.py
mesalib/include/GL/glext.h
mesalib/include/GL/glxext.h
mesalib/src/glsl/.gitignore
mesalib/src/mesa/drivers/dri/common/xmlconfig.h
mesalib/src/mesa/main/.gitignore
xorg-server/Xext/xvmain.c
xorg-server/dix/dispatch.c
xorg-server/hw/xfree86/common/compiler.h
Diffstat (limited to 'xorg-server/hw/xwayland/xwayland.h')
| -rw-r--r-- | xorg-server/hw/xwayland/xwayland.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/xorg-server/hw/xwayland/xwayland.h b/xorg-server/hw/xwayland/xwayland.h index fc6855044..60b0c2964 100644 --- a/xorg-server/hw/xwayland/xwayland.h +++ b/xorg-server/hw/xwayland/xwayland.h @@ -27,7 +27,6 @@ #define XWAYLAND_H #include <dix-config.h> -#include <xorg-server.h> #include <stdio.h> #include <unistd.h> |