xserver: Branch 'master'

[Adam Jackson]

 hw/xfree86/common/xf86Init.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7cf80b9714864c3c4eb9898ff1b7d657ecd16df7
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Jun 1 14:27:23 2016 -0400

    xfree86: Don't swallow ±iglx command line flag
    
    We want to notice that it's set, but still pass it through to dix.
    Return 0 to indicate this.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c
index 93c0d74..998100a 100644
--- a/hw/xfree86/common/xf86Init.c
+++ b/hw/xfree86/common/xf86Init.c
@@ -1378,7 +1378,7 @@ ddxProcessArgument(int argc, char **argv, int i)
     }
     if (!strcmp(argv[i], "-iglx") || !strcmp(argv[i], "+iglx")) {
         xf86Info.iglxFrom = X_CMDLINE;
-        return 1;
+        return 0;
     }
 
     /* OS-specific processing */