This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/osx in repository x2goclient. commit 687948e16ef831a41b3116fbfb2d1774d77fef48 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon May 25 01:50:35 2015 +0200 sshmasterconnection.cpp: fix typo in last commit leading to a compile failure, correct content, remove superfluous newlines. --- debian/changelog | 2 ++ src/sshmasterconnection.cpp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f4666e0..23500bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -425,6 +425,8 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low + sshmasterconnection.cpp + sshprocess.cpp + wapi.cpp + - sshmasterconnection.cpp: fix typo in last commit leading to a compile + failure, correct content, remove superfluous newlines. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/sshmasterconnection.cpp b/src/sshmasterconnection.cpp index 9871c9f..bae0410 100644 --- a/src/sshmasterconnection.cpp +++ b/src/sshmasterconnection.cpp @@ -1544,7 +1544,7 @@ void SshMasterConnection::channelLoop() if ( rez==SSH_EOF ) { #ifdef DEBUG - x2goDebug<<"EOF on channel "<<channel<<"; SshProcess PID: "<<channelConnections[i].creator->pid<<<<endl; + x2goDebug<<"EOF on channel "<<channel<<"; SshProcess object: "<<channelConnections[i].creator->pid; #endif //////Finished//////// finalize ( i ); @@ -1599,7 +1599,7 @@ void SshMasterConnection::channelLoop() if ( channel_is_eof ( channel ) ) { #ifdef DEBUG - x2goDebug<<"EOF on channel "<<channel<<"; SshProcess PID: "<<channelConnections[i].creator->pid<<endl; + x2goDebug<<"EOF on channel "<<channel<<"; SshProcess object: "<<channelConnections[i].creator->pid; #endif //////Finished//////// finalize ( i ); -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git