xserver: Branch 'master'

[Keith Packard]

 os/utils.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e3aa13b8d63ea2fba6eb47ddd0a7dde5a6d2b661
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Wed Sep 17 15:38:39 2014 -0700

    Update help text since -iglx is now the default
    
    This should have been part of d0da0e9c3bb8fe0cd4879ecb24d21715bfaa209b
    
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>
    Signed-off-by: Eric Anholt <eric at anholt.net>
    Reviewed-by: Eric Anholt <eric at anholt.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/os/utils.c b/os/utils.c
index c83f77d..2d02f92 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -541,8 +541,8 @@ UseMsg(void)
     ErrorF("-fn string             default font name\n");
     ErrorF("-fp string             default font path\n");
     ErrorF("-help                  prints message with these options\n");
-    ErrorF("+iglx                  Allow creating indirect GLX contexts (default)\n");
-    ErrorF("-iglx                  Prohibit creating indirect GLX contexts\n");
+    ErrorF("+iglx                  Allow creating indirect GLX contexts\n");
+    ErrorF("-iglx                  Prohibit creating indirect GLX contexts (default)\n");
     ErrorF("-I                     ignore all remaining arguments\n");
 #ifdef RLIMIT_DATA
     ErrorF("-ld int                limit data space to N Kb\n");