aboutsummaryrefslogtreecommitdiff
path: root/nxcomp
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-30 00:06:58 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-12-30 00:06:58 +0100
commit1391c0ad76cb1f8588a08f9350d2ba1fe98b8b6b (patch)
treec2d62e905a69bdbc787a6599b8b0f0e21fcdfe70 /nxcomp
parente4763fb4879ce8782e50c784ed9e7d8c5a1b7322 (diff)
parentc4a388937baad8215f2650d746d3ddba4d4d1ee3 (diff)
downloadnx-libs-1391c0ad76cb1f8588a08f9350d2ba1fe98b8b6b.tar.gz
nx-libs-1391c0ad76cb1f8588a08f9350d2ba1fe98b8b6b.tar.bz2
nx-libs-1391c0ad76cb1f8588a08f9350d2ba1fe98b8b6b.zip
Merge branch 'sunweaver-pr/xinerama-xrandr' into 3.6.x
Attributes GH PR #66: https://github.com/ArcticaProject/nx-libs/pull/66
Diffstat (limited to 'nxcomp')
-rw-r--r--nxcomp/Misc.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp
index 3297d8ee8..ee73f19d8 100644
--- a/nxcomp/Misc.cpp
+++ b/nxcomp/Misc.cpp
@@ -306,6 +306,7 @@ clipboard=n\n\
streaming=n\n\
backingstore=n\n\
composite=n\n\
+xinerama=n\n\
shmem=b\n\
shpix=b\n\
kbtype=s\n\