[X2go-Commits] x2goserver.git - master (branch) updated: 3.1.1.3-97-ga49082a
X2Go dev team
git-admin at x2go.org
Fri Nov 23 15:35:04 CET 2012
The branch, master has been updated
via a49082addab34ae907fe7de688f540e5f0b80225 (commit)
from 3b277bdecf2e517b5af746755848b999456197dc (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 a49082addab34ae907fe7de688f540e5f0b80225
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Fri Nov 23 15:32:39 2012 +0100
release 3.1.1.9 (cherry-picked from release branch, updates changelog)
Conflicts (resolved by Mike Gabriel):
debian/changelog
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 751c65f..f6164bf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,13 +32,13 @@ x2goserver (3.2.0.0-0~x2go1) UNRELEASED; urgency=low
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Tue, 03 Jul 2012 10:03:28 +0200
-x2goserver (3.1.1.9-0~x2go1) UNRELEASED; urgency=low
+x2goserver (3.1.1.9-0~x2go1) unstable; urgency=low
- * New upstream release (3.1.1.9):
+ * New bugfix release (3.1.1.9):
- Fix x2godesktopsharing, we had added to many quotation marks in
x2gostartagent.
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 23 Nov 2012 12:06:40 +0100
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Fri, 23 Nov 2012 15:32:11 +0100
x2goserver (3.1.1.8-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