diff options
| author | marha <marha@users.sourceforge.net> | 2013-11-25 12:10:25 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-11-25 12:10:25 +0100 |
| commit | 0f333fb1102f4886a8ce39f3c09b12e89e5a7f19 (patch) | |
| tree | 8239768e506a03837019c4f02c8ab949c04a0818 /xorg-server/hw | |
| parent | 7dbaa1cffdf176f803f2c7069fb6810e16a86f72 (diff) | |
| parent | a473b885d641b9c1ea57f2ae53f9ba7f2958cce2 (diff) | |
| download | vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.tar.gz vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.tar.bz2 vcxsrv-0f333fb1102f4886a8ce39f3c09b12e89e5a7f19.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
libX11 xserver mesa libXinerama libXmu mkfontscale git update 25 nov 2013
Conflicts:
libXinerama/src/Xinerama.c
Diffstat (limited to 'xorg-server/hw')
| -rw-r--r-- | xorg-server/hw/xnest/GCOps.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/xorg-server/hw/xnest/GCOps.c b/xorg-server/hw/xnest/GCOps.c index 7b1956de0..d00511d71 100644 --- a/xorg-server/hw/xnest/GCOps.c +++ b/xorg-server/hw/xnest/GCOps.c @@ -115,7 +115,6 @@ xnestGetImage(DrawablePtr pDrawable, int x, int y, int w, int h, ximage = XGetImage(xnestDisplay, xnestDrawable(pDrawable), x, y, w, h, planeMask, format); - XSync(xnestDisplay, False); XSetErrorHandler(old_handler); if (ximage) { |