This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch 3.5.0.x in repository nx-libs. commit 266d5affbc8339411090db497bfbafdc5e4944b2 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Apr 27 02:48:10 2015 +0200 README.keystrokes: remove accidentally copied Dokuwiki syntax. Backported from Arctica GH 3.6.x branch. Affects: - 0320_nxagent_configurable-keystrokes.full.patch --- debian/changelog | 1 + ...0320_nxagent_configurable-keystrokes.full.patch | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b43247f..88936b9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -130,6 +130,7 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low - Copy actions documentation from the wiki. - Add documentation for branding behavior. + - Remove accidentally copied Dokuwiki syntax. * debian/keystrokes.cfg: fix whitespace errors. Backported from Arctica GH 3.6.x branch. diff --git a/debian/patches/0320_nxagent_configurable-keystrokes.full.patch b/debian/patches/0320_nxagent_configurable-keystrokes.full.patch index 475b9d0..495e007 100644 --- a/debian/patches/0320_nxagent_configurable-keystrokes.full.patch +++ b/debian/patches/0320_nxagent_configurable-keystrokes.full.patch @@ -921,7 +921,7 @@ Description: Make nxagent-specific keyboard bindings configurable +- in ~/.nx/config/keystrokes.cfg +- in /etc/nxagent/keystrokes.cfg + -+If nxagent is called **with X2Go branding** (i.e., as x2goagent), it searches: ++If nxagent is called with X2Go branding (i.e., as x2goagent), it searches: +- in the location given by the '-keystrokefile' command line parameter +- in the location given by the NXAGENT_KEYSTROKEFILE environment variable +- in ~/.x2go/config/keystrokes.cfg -- Alioth's /srv/git/code.x2go.org/nx-libs.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git