diff options
| author | marha <marha@users.sourceforge.net> | 2011-07-14 16:15:03 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-07-14 16:15:03 +0200 |
| commit | 31ee9c57db79281e122d3c4acb0f8eae07f4449f (patch) | |
| tree | 222bc6f83ebdb15721e7acfdb829aa85606e243a /xorg-server/hw/xwin/man | |
| parent | 8797d6ab8ef5121c900cd74b8662305ec7aeb34b (diff) | |
| parent | d03a5f20114203fd00e0004659fd2617f4c03a32 (diff) | |
| download | vcxsrv-31ee9c57db79281e122d3c4acb0f8eae07f4449f.tar.gz vcxsrv-31ee9c57db79281e122d3c4acb0f8eae07f4449f.tar.bz2 vcxsrv-31ee9c57db79281e122d3c4acb0f8eae07f4449f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/state_tracker/st_context.c
xorg-server/hw/xquartz/GL/indirect.c
xorg-server/hw/xwin/glx/indirect.c
xorg-server/hw/xwin/glx/wgl_ext_api.c
xorg-server/hw/xwin/glx/winpriv.c
xorg-server/hw/xwin/man/XWin.man
xorg-server/hw/xwin/winmultiwindowwindow.c
Diffstat (limited to 'xorg-server/hw/xwin/man')
| -rw-r--r-- | xorg-server/hw/xwin/man/XWin.man | 4 | ||||
| -rw-r--r-- | xorg-server/hw/xwin/man/XWinrc.man | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/xorg-server/hw/xwin/man/XWin.man b/xorg-server/hw/xwin/man/XWin.man index 98e63abf1..0330c4caa 100644 --- a/xorg-server/hw/xwin/man/XWin.man +++ b/xorg-server/hw/xwin/man/XWin.man @@ -208,6 +208,10 @@ Enable or disable the \fICtrl-Alt-Backspace\fP key combination as a signal to exit the X Server. The \fICtrl-Alt-Backspace\fP key combination
is disabled by default.
.TP 8
+.B \-[no]wgl
+Enable [disable] the GLX extension to use the native Windows WGL interface
+for hardware accelerated OpenGL (AIGLX). (Experimental)
+.TP 8
.B \-[no]winkill
Enable or disable the \fIAlt-F4\fP key combination as a signal to exit the
X Server.
diff --git a/xorg-server/hw/xwin/man/XWinrc.man b/xorg-server/hw/xwin/man/XWinrc.man index 5c1fb979b..e4c454fba 100644 --- a/xorg-server/hw/xwin/man/XWinrc.man +++ b/xorg-server/hw/xwin/man/XWinrc.man @@ -1,4 +1,4 @@ -.TH XWIN 5 __vendorversion__ +.TH XWIN __filemansuffix__ __vendorversion__ .SH NAME |