diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-18 09:27:39 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-18 09:27:39 +0200 |
| commit | 2dd1a1fe6dbbffd764ea0a36743ec7d8e83b2ad6 (patch) | |
| tree | bc82daeb0090eea8dc7eb977cc82a3ed47284262 /nxcomp/Misc.cpp | |
| parent | 3dea5a88cad4ee51b2240bb95693ccb4c43047b5 (diff) | |
| parent | 6051dec4a1ae6decd9123a3310098baf43f45c49 (diff) | |
| download | nx-libs-2dd1a1fe6dbbffd764ea0a36743ec7d8e83b2ad6.tar.gz nx-libs-2dd1a1fe6dbbffd764ea0a36743ec7d8e83b2ad6.tar.bz2 nx-libs-2dd1a1fe6dbbffd764ea0a36743ec7d8e83b2ad6.zip | |
Merge branch 'Ionic-feature/configurablesleep' into 3.6.x
Attributes GH PR #143: https://github.com/ArcticaProject/nx-libs/pull/143
Diffstat (limited to 'nxcomp/Misc.cpp')
| -rw-r--r-- | nxcomp/Misc.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/nxcomp/Misc.cpp b/nxcomp/Misc.cpp index ee73f19d8..05794bded 100644 --- a/nxcomp/Misc.cpp +++ b/nxcomp/Misc.cpp @@ -316,7 +316,8 @@ shadowuid=n\n\ shadowmode=s\n\ defer=n\n\ tile=s\n\ -menu=n These options are interpreted by the NX agent. They\n\ +menu=n\n\ +sleep=n These options are interpreted by the NX agent. They\n\ are ignored by the proxy.\n\ \n\ Environment:\n\ |