[X2Go-Commits] x2goserver.git - build-main (branch) updated: 4.0.1.9-41-geec64c2
X2Go dev team
git-admin at x2go.org
Fri Jan 3 17:57:50 CET 2014
The branch, build-main has been updated
via eec64c23ea370dc7c025aed82379290915d45302 (commit)
from e75d01aeaedee8eba8c46491b581e5384931f638 (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 eec64c23ea370dc7c025aed82379290915d45302
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Jan 3 11:31:49 2014 +0100
release 4.0.0.8 (cherry-picked from release/4.0.0.x branch)
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 5cf6ac8..636baee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -162,7 +162,7 @@ x2goserver (4.0.1.0-0~x2go1) unstable; urgency=low
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 07 Jun 2013 23:07:40 +0200
-x2goserver (4.0.0.8-0x2go1) UNRELEASED; urgency=low
+x2goserver (4.0.0.8-0x2go1) unstable; urgency=low
* New upstream version (4.0.0.8):
- Use mktemp instead of tempfile (because Fedora does not have the tempfile
@@ -180,7 +180,7 @@ x2goserver (4.0.0.8-0x2go1) UNRELEASED; urgency=low
- Sanitize session ID string, port numbers, display numbers and agent PID
numbers before writing them as strings to the session DB.
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Thu, 28 Nov 2013 16:14:32 +0100
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 03 Jan 2014 11:30:54 +0100
x2goserver (4.0.0.7-0x2go1) 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