diff options
| author | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 01:09:05 +0100 |
|---|---|---|
| committer | Mihai Moldovan <ionic@ionic.de> | 2018-02-26 01:09:05 +0100 |
| commit | 164263e1a12fc8a3a496739799cb60d547857f0a (patch) | |
| tree | f94c76301d393c9e232a0d7d3f6d6f43373f8c56 /nxproxy | |
| parent | 05152b788ab184f45df1f64182791c88a09dc6f9 (diff) | |
| parent | 8d00456ad3e7b7a49d8fadb269334589e3704758 (diff) | |
| download | nx-libs-164263e1a12fc8a3a496739799cb60d547857f0a.tar.gz nx-libs-164263e1a12fc8a3a496739799cb60d547857f0a.tar.bz2 nx-libs-164263e1a12fc8a3a496739799cb60d547857f0a.zip | |
Merge branch 'sunweaver-pr/nomagicpixel' into 3.6.x
Attributes GH PR #658: https://github.com/ArcticaProject/nx-libs/pull/658
Fixes: ArcticaProject/nx-libs#657
Diffstat (limited to 'nxproxy')
| -rw-r--r-- | nxproxy/man/nxproxy.1 | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nxproxy/man/nxproxy.1 b/nxproxy/man/nxproxy.1 index bf194e7cf..260465ab1 100644 --- a/nxproxy/man/nxproxy.1 +++ b/nxproxy/man/nxproxy.1 @@ -327,6 +327,7 @@ encryption of the point to point communication. defer=<int> tile=<string> menu=<int> + magicpixel=<int> sleep=<int> .SH NX ENVIRONMENT VARIABLES |