This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit a71feeac37eb5cd4447a2188b4960a8538604814 Author: Oleksandr Shneyder <o.shneyder@phoca-gmbh.de> Date: Mon Mar 3 17:06:40 2014 +0100 Fix debian/changelog after resolving merge conflict. --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index daec032..544551b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -13,6 +13,8 @@ x2goclient (4.0.2.0-0x2go1) UNRELEASED; urgency=low - Don't show GUI dialog for --version, --help, etc, if started from terminal on linux and mac. - If no user in session config, display system username in pass form. + - Check if txt/changelog and txt/git exist on config phase. + Rename option "--git" to "--git-info". [ Josh Lukens ] * New upstream version (4.0.2.0): -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git