diff options
| author | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-01-29 12:38:49 +0000 |
|---|---|---|
| committer | Jon TURNEY <jon.turney@dronecode.org.uk> | 2012-01-29 12:38:49 +0000 |
| commit | 45e67e363e19a481cb8001574d0238ad42e10e60 (patch) | |
| tree | f6f521d467e10b9baa013dcd6e79ba143beddf2a /hw/xwin/InitOutput.c | |
| parent | a20912c5cc6bd48c359f4780c1c4160c1e8cdab3 (diff) | |
| parent | 207b6835b70bdd11883298ae6523d66ee812cdf0 (diff) | |
Merge branch 'cygwin-patches-for-1.11' into cygwin-release-1.11xserver-cygwin-1.11.4-1
Conflicts:
hw/xwin/winmultiwindowwindow.c
Diffstat (limited to 'hw/xwin/InitOutput.c')
| -rw-r--r-- | hw/xwin/InitOutput.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/xwin/InitOutput.c b/hw/xwin/InitOutput.c index 7989b2831..edf6a3a15 100644 --- a/hw/xwin/InitOutput.c +++ b/hw/xwin/InitOutput.c @@ -897,7 +897,7 @@ winUseMsg (void) ErrorF ("-resize=none|scrollbars|randr" "\tIn windowed mode, [don't] allow resizing of the window. 'scrollbars'\n" "\tmode gives the window scrollbars as needed, 'randr' mode uses the RANR\n" - "\textension to resize the X screen.\n"); + "\textension to resize the X screen. 'randr' is the default.\n"); ErrorF ("-rootless\n" "\tRun the server in rootless mode.\n"); @@ -931,7 +931,8 @@ winUseMsg (void) #ifdef XWIN_GLX_WINDOWS ErrorF ("-[no]wgl\n" - "\tEnable the GLX extension to use the native Windows WGL interface for accelerated OpenGL\n"); + "\tEnable the GLX extension to use the native Windows WGL interface\n" + "\tfor hardware-accelerated OpenGL (AIGLX). Enabled by default.\n"); #endif ErrorF ("-[no]winkill\n" |