This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch release/4.0.1.x in repository x2goserver. commit de62c515e12addce4409ff5a06e4c046c384326e Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Mon Oct 13 16:01:36 2014 +0200 x2goserver.spec: Don't mention /etc/x2go/x2gosql/sql twice (directly and with wildcard). Conflicts (resolved by Mike Gabriel): x2goserver.spec --- debian/changelog | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/changelog b/debian/changelog index 7e7d703..13800fd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ x2goserver (4.0.1.19-0x2go1) UNRELEASED; urgency=medium + No shell expansion possible in obs-build, detect perl version only for non-SUSE builds. + Add to R: x2goserver-xsession. + + Don't mention /etc/x2go/x2gosql/sql twice (directly and with wildcard). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 07 Oct 2014 15:35:38 +0200 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git