This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch release/4.1.0.1
in repository x2goclient.

commit a2730823b2793b578f6703ad26f7a30fcd895a67
Author: Seth Galitzer <sg...@ksu.edu>
Date:   Wed Mar 22 00:49:08 2017 +0100

    src/help.cpp: add documentation for the --background option. Part of #1162.
---
 debian/changelog | 5 +++++
 src/help.cpp     | 1 +
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c9b60ca..edb2a45 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,11 @@ x2goclient (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
       Set for direct XDMCP session autologin=true.
       Set for direct XDMCP session username=XDM.
 
+  [ Seth Galitzer ]
+  * New upstream version (4.1.0.1):
+    - src/help.cpp: add documentation for the --background option.
+      Part of #1162.
+
  -- X2Go Release Manager <git-ad...@x2go.org>  Wed, 22 Feb 2017 07:13:10 +0100
 
 x2goclient (4.1.0.0-0x2go1) unstable; urgency=medium
diff --git a/src/help.cpp b/src/help.cpp
index 5c128db..c3f6a59 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -154,6 +154,7 @@ help::params_t help::build_params () {
   ADD_OPT ("--broker-ssh-key=<path to key>", QT_TRANSLATE_NOOP ("Help", "Sets 
the path to an SSH key to use for authentication against an SSH session broker. 
The client's behavior is undefined if this flag is used for non-SSH session 
brokers."));
   ADD_OPT ("--broker-autologin", QT_TRANSLATE_NOOP ("Help", "Enables the use 
of the default SSH key or SSH agent for authentication against an SSH session 
broker. The client's behavior is undefined if this flag is used for non-SSH 
session brokers."));
   ADD_OPT ("--broker-noauth", QT_TRANSLATE_NOOP ("Help", "Does not ask for 
user credentials during session broker authentication. This can be useful if 
you are using an HTTP(S) session broker without authentication. If you run an 
HTTP(S) server without authentication, but with user-specific profiles, then 
put the user name into the broker URL (refer to --broker-url.) The user name 
then will be extracted from the broker URL and be sent to the session broker. 
The client's behavior is undef [...]
+  ADD_OPT ("--background=<svg-file>", QT_TRANSLATE_NOOP ("Help", "Use a 
custom/branded background image (SVG format) for X2Go Client's main window."));
 
 # undef NEWLINE
 # undef ADD_OPT

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email 
on /srv/git/code.x2go.org/x2goclient.git
_______________________________________________
x2go-commits mailing list
x2go-commits@lists.x2go.org
https://lists.x2go.org/listinfo/x2go-commits

Reply via email to