[X2Go-Commits] [x2goclient] 01/01: Merge branch 'master' into feature/cleanup

[git-admin at x2go.org]

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

x2go pushed a commit to branch feature/cleanup
in repository x2goclient.

commit f7162c87e4e9a890ee3b7939af4ceed06531347d
Merge: 46427fd cb1df7d
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Feb 18 01:55:20 2015 +0100

    Merge branch 'master' into feature/cleanup

 debian/changelog     |    2 ++
 src/onmainwindow.cpp |   36 +++++++++++++++++++++++-------------
 2 files changed, 25 insertions(+), 13 deletions(-)


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