diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-02 08:51:35 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-02 08:51:35 +0200 |
| commit | fcc2cc7dabb46c39a76351fc12da4e9ad9d1d817 (patch) | |
| tree | bcc60a76e7cc205710b91c67ff700c26886ea3e8 /xorg-server | |
| parent | 393178cdbca247c6ad077f7dab9a97d6817c625c (diff) | |
| parent | fdef5bff99e6079f64bc6b91c91b42195c85adeb (diff) | |
| download | vcxsrv-fcc2cc7dabb46c39a76351fc12da4e9ad9d1d817.tar.gz vcxsrv-fcc2cc7dabb46c39a76351fc12da4e9ad9d1d817.tar.bz2 vcxsrv-fcc2cc7dabb46c39a76351fc12da4e9ad9d1d817.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
pixman/pixman/pixman-sse2.c
Diffstat (limited to 'xorg-server')
| -rw-r--r-- | xorg-server/randr/rrscreen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xorg-server/randr/rrscreen.c b/xorg-server/randr/rrscreen.c index 55110e088..c564d1f96 100644 --- a/xorg-server/randr/rrscreen.c +++ b/xorg-server/randr/rrscreen.c @@ -195,7 +195,7 @@ ProcRRGetScreenSizeRange(ClientPtr client) rrScrPrivPtr pScrPriv; int rc; - REQUEST_SIZE_MATCH(xRRGetScreenInfoReq); + REQUEST_SIZE_MATCH(xRRGetScreenSizeRangeReq); rc = dixLookupWindow(&pWin, stuff->window, client, DixGetAttrAccess); if (rc != Success) return rc; |