[X2Go-Commits] [x2goclient] branch bugfix/x2goplugin-patch updated (060d584 -> db490c3)

[git-admin at x2go.org]

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  060d584   src/{onmainwindow,sshmasterconnection}.cpp: enable use of SSH proxy configuration with x2goplugin. Fixes: #798.
      adds  3d57875   onmainwindow.cpp: handle %i and %c format flags in desktop files correctly: remove the %i flag and replace %c with the application name. Fixes: #827.
       new  db490c3   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   (060d584)
            \
             N -- N -- N   refs/heads/bugfix/x2goplugin-patch (db490c3)

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     |    6 ++++++
 src/onmainwindow.cpp |    2 ++
 2 files changed, 8 insertions(+)

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