diff options
| author | marha <marha@users.sourceforge.net> | 2012-09-24 08:40:01 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-09-24 08:50:12 +0200 |
| commit | c24a0fccb18e611b2879e68565ab8f1c5c5dbd62 (patch) | |
| tree | 8b2070725227ae6c92ded43789f80347fabac306 /xorg-server/hw/kdrive | |
| parent | 210f44f785e5b0da1bfe6ea68ad8f31c4ad2e282 (diff) | |
| parent | 0ebcd32e91486caccc041c8ca23e39e160b24702 (diff) | |
| download | vcxsrv-c24a0fccb18e611b2879e68565ab8f1c5c5dbd62.tar.gz vcxsrv-c24a0fccb18e611b2879e68565ab8f1c5c5dbd62.tar.bz2 vcxsrv-c24a0fccb18e611b2879e68565ab8f1c5c5dbd62.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa pixman xserver git update 24 sep 2012
Conflicts:
pixman/pixman/pixman-sse2.c
xorg-server/dix/window.c
Diffstat (limited to 'xorg-server/hw/kdrive')
| -rw-r--r-- | xorg-server/hw/kdrive/src/kdrive.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/xorg-server/hw/kdrive/src/kdrive.h b/xorg-server/hw/kdrive/src/kdrive.h index 9033adb88..b93dfd6f4 100644 --- a/xorg-server/hw/kdrive/src/kdrive.h +++ b/xorg-server/hw/kdrive/src/kdrive.h @@ -32,7 +32,6 @@ #include "pixmapstr.h" #include "windowstr.h" #include "servermd.h" -#include "mibstore.h" #include "colormapst.h" #include "gcstruct.h" #include "input.h" |