diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-18 19:46:28 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-18 19:46:28 +0200 |
commit | c31ae1eed4d2a77e0962bee16279459cb5f7cd65 (patch) | |
tree | 8b2a43fffc3d0c4498b804f32c8600baad629915 /nx-X11/programs/Xserver/hw/nxagent/Options.h | |
parent | 2dd1a1fe6dbbffd764ea0a36743ec7d8e83b2ad6 (diff) | |
parent | 4b4a6a35c47590bd4ab1c16d9bf1398bb51624b2 (diff) | |
download | nx-libs-c31ae1eed4d2a77e0962bee16279459cb5f7cd65.tar.gz nx-libs-c31ae1eed4d2a77e0962bee16279459cb5f7cd65.tar.bz2 nx-libs-c31ae1eed4d2a77e0962bee16279459cb5f7cd65.zip |
Merge branch 'sunweaver-pr/rrxinerama-vs-panoramix-with-disable-support' into 3.6.x
Attributes GH PR #135: https://github.com/ArcticaProject/nx-libs/pull/135
Reviewed by: Ulrich Sibiller <uli42@gmx.de> -- Sat, 18 Jun 2016 05:25:08 -0700
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Options.h')
-rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Options.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Options.h b/nx-X11/programs/Xserver/hw/nxagent/Options.h index 02b886242..7e9f8d2ea 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Options.h +++ b/nx-X11/programs/Xserver/hw/nxagent/Options.h @@ -390,12 +390,12 @@ typedef struct _AgentOptions int NoRootlessExit; /* - * Store if the user wants Xinerama. There's a variable called - * noPanoramiXExtension in os/utils.c but we cannot rely on that - * because RandR and Panoramix change its value when trying to - * initialize. So we use this variable to save the user preference - * provided by the -/+xinerama parameter before initalizing those - * extensions. + * Store if the user wants Xinerama. There are variables called + * noPanoramiXExtension noRRXineramaExtensison in os/utils.c but + * we cannot rely on them because RandR and PanoramiX change their + * values when trying to initialize. So we use this variable to + * save the user preference provided by the -/+(rr)xinerama parameter(s) + * before initalizing those extensions. */ int Xinerama; |