aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/hw/kdrive/ephyr
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-06 10:36:17 +0200
committermarha <marha@users.sourceforge.net>2011-06-06 10:36:17 +0200
commit336e4aab196609a528213e9ecebcb30fce7aa654 (patch)
treec8a72cf42c0bbe281dffdac04d60e758aeea345f /xorg-server/hw/kdrive/ephyr
parent097c0d8400d976c5c372db576a11764e87994c7f (diff)
parent416761431e76dcb053fa3447b6d53051579dad0a (diff)
downloadvcxsrv-336e4aab196609a528213e9ecebcb30fce7aa654.tar.gz
vcxsrv-336e4aab196609a528213e9ecebcb30fce7aa654.tar.bz2
vcxsrv-336e4aab196609a528213e9ecebcb30fce7aa654.zip
Merge remote-tracking branch 'origin/released'
Conflicts: xorg-server/hw/xquartz/GL/indirect.c xorg-server/hw/xquartz/mach-startup/Makefile.am xorg-server/test/xi2/protocol-common.c xorg-server/xkb/xkbfmisc.c
Diffstat (limited to 'xorg-server/hw/kdrive/ephyr')
-rw-r--r--xorg-server/hw/kdrive/ephyr/man/Xephyr.man2
1 files changed, 2 insertions, 0 deletions
diff --git a/xorg-server/hw/kdrive/ephyr/man/Xephyr.man b/xorg-server/hw/kdrive/ephyr/man/Xephyr.man
index 8e7bfd550..12c9f58bc 100644
--- a/xorg-server/hw/kdrive/ephyr/man/Xephyr.man
+++ b/xorg-server/hw/kdrive/ephyr/man/Xephyr.man
@@ -39,6 +39,8 @@ uses the host X server window as "framebuffer" via fast SHM XImages.
It also has support for "visually" debugging what the server is
painting.
.SH OPTIONS
+The server accepts all the standard options of Xserver(__appmansuffix__)
+and the following additional options:
.TP 8
.BI -screen " width" x height
sets the screen size.