[X2Go-Commits] [x2goclient] branch bugfix/x2goplugin-patch updated (75a99c2 -> da3ca16)

git-admin at x2go.org git-admin at x2go.org
Thu Mar 12 14:19:18 CET 2015


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

x2go pushed a change to branch bugfix/x2goplugin-patch
in repository x2goclient.

  discards  75a99c2   src/{onmainwindow,sshmasterconnection}.cpp: enable use of SSH proxy configuration with x2goplugin. Fixes: #798.
      adds  4776273   onmainwindow.{cpp,h}: make slotTunnelOk parameter optional and use the non-parameter call for the QSingleShotTimer::timeout() signal.
       new  da3ca16   src/{onmainwindow,sshmasterconnection}.cpp: enable use of SSH proxy configuration with x2goplugin. Fixes: #798.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (75a99c2)
            \
             N -- N -- N   refs/heads/bugfix/x2goplugin-patch (da3ca16)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omits" are not gone; other references still
refer to them.  Any revisions marked "discards" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/changelog     |    2 ++
 src/onmainwindow.cpp |    2 +-
 src/onmainwindow.h   |    2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

--
Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git


More information about the x2go-commits mailing list