This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit a6ae6f6b9795f2cb8e6ecc2c541b4d8adfc21dd3 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Tue Feb 4 12:41:15 2014 +0100 changelog fix for last commit Conflicts (resolved by Mike Gabriel): debian/changelog --- debian/changelog | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 6d8ce2a..132455a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -20,7 +20,11 @@ x2goclient (4.0.1.4-0x2go1) UNRELEASED; urgency=low - Fix mod map on Mac with kerberos. - Fix focus on pass form. - -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 22 Jan 2014 09:20:08 +0100 + [ Orion Poplawski ] + * New upstream version (4.0.1.4): + - Fix password connection with libssh 0.6.0 + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Wed, 22 Jan 2014 09:17:39 +0100 x2goclient (4.0.1.3-0x2go1) unstable; urgency=low -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git