[X2Go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-158-gda78814
X2Go dev team
git-admin at x2go.org
Sun May 19 01:03:56 CEST 2013
The branch, master has been updated
via da78814254872c8d400aea80aff6f63f7ef08d10 (commit)
from dfa5930ccce0cecc922150899606e891f81929fd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit da78814254872c8d400aea80aff6f63f7ef08d10
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Sun May 19 00:55:01 2013 +0200
cherry-pick from release branch: update changelog for release 4.0.0.2
Conflicts (resolved by Mike Gabriel):
debian/changelog
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 0a32e0a..43a974b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -50,7 +50,7 @@ x2goserver (4.1.0.0-0~x2go1) UNRELEASED; urgency=low
-- Reinhard Tartler <siretart at tauware.de> Thu, 20 Dec 2012 10:15:26 +0100
-x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low
+x2goserver (4.0.0.2-0~x2go1) unstable; urgency=low
[ Matthew L. Dailey ]
* New upstream version (4.0.0.2):
@@ -73,7 +73,7 @@ x2goserver (4.0.0.2-0~x2go1) UNRELEASED; urgency=low
+ Create session log symlink after launching x2goagent. Fix order of target
and symlink name when executing the command.
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Mon, 25 Mar 2013 22:34:11 +0100
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Sun, 19 May 2013 00:54:34 +0200
x2goserver (4.0.0.1-0~x2go1) unstable; urgency=low
hooks/post-receive
--
x2goserver.git (X2Go Server)
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "x2goserver.git" (X2Go Server).
More information about the x2go-commits
mailing list