xserver: Branch 'master'

[Keith Packard]

 randr/rroutput.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 437d2ec5f250f8ab4b44cbae56f938719802e1cc
Author: Carlos Sánchez de La Lama <csanchezdll at gmail.com>
Date:   Wed Jan 21 10:22:05 2015 +0100

    randr: swap num-preferred field on RRGetOutputInfo reply
    
    Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=88614
    Signed-off-by: Carlos Sánchez de La Lama <csanchezdll at gmail.com>
    Reviewed-by: Dave Airlie <airlied at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/randr/rroutput.c b/randr/rroutput.c
index f824f50..5d46fac 100644
--- a/randr/rroutput.c
+++ b/randr/rroutput.c
@@ -487,6 +487,7 @@ ProcRRGetOutputInfo(ClientPtr client)
         swapl(&rep.mmHeight);
         swaps(&rep.nCrtcs);
         swaps(&rep.nModes);
+        swaps(&rep.nPreferred);
         swaps(&rep.nClones);
         swaps(&rep.nameLength);
     }