The branch, master has been updated via 1e456df9ead1de07477f79f4eb0f4fab7ab406fa (commit) from b3a43f4f651b1239a9af48a7469cf7a0c69a4719 (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 1e456df9ead1de07477f79f4eb0f4fab7ab406fa Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Sat Jan 4 11:39:29 2014 +0100 Continue development on stable branch of X2Go Server... (cherry-picked from release/4.0.1.x branch) Conflicts (resolved by Mike Gabriel) debian/changelog x2goserver-compat/VERSION.x2goserver-compat x2goserver-extensions/VERSION.x2goserver-extensions x2goserver-fmbindings/VERSION.x2goserver-fmbindings x2goserver-printing/VERSION.x2goserver-printing x2goserver-pyhoca/VERSION.x2goserver-pyhoca x2goserver-xsession/VERSION.x2goserver-xsession x2goserver/VERSION.x2goserver ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ .../VERSION.x2goserver-extensions | 2 +- .../VERSION.x2goserver-fmbindings | 2 +- x2goserver-printing/VERSION.x2goserver-printing | 2 +- x2goserver-xsession/VERSION.x2goserver-xsession | 2 +- x2goserver/VERSION.x2goserver | 2 +- 6 files changed, 11 insertions(+), 5 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ba72550..5bd1722 100644 --- a/debian/changelog +++ b/debian/changelog @@ -96,6 +96,12 @@ x2goserver (4.1.0.0-0x2go1) UNRELEASED; urgency=low -- Reinhard Tartler <siretart@tauware.de> Thu, 20 Dec 2012 10:15:26 +0100 +x2goserver (4.0.1.11-0x2go1) UNRELEASED; urgency=low + + * Continue development on stable branch of X2Go Server... + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 04 Jan 2014 11:29:35 +0100 + x2goserver (4.0.1.10-0x2go1) unstable; urgency=low * New upstream version (4.0.1.10): diff --git a/x2goserver-extensions/VERSION.x2goserver-extensions b/x2goserver-extensions/VERSION.x2goserver-extensions index 1667ae5..8a1136f 100644 --- a/x2goserver-extensions/VERSION.x2goserver-extensions +++ b/x2goserver-extensions/VERSION.x2goserver-extensions @@ -1 +1 @@ -4.1.0.0-preview \ No newline at end of file +4.1.0.0-preview diff --git a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings index 1667ae5..8a1136f 100644 --- a/x2goserver-fmbindings/VERSION.x2goserver-fmbindings +++ b/x2goserver-fmbindings/VERSION.x2goserver-fmbindings @@ -1 +1 @@ -4.1.0.0-preview \ No newline at end of file +4.1.0.0-preview diff --git a/x2goserver-printing/VERSION.x2goserver-printing b/x2goserver-printing/VERSION.x2goserver-printing index 1667ae5..8a1136f 100644 --- a/x2goserver-printing/VERSION.x2goserver-printing +++ b/x2goserver-printing/VERSION.x2goserver-printing @@ -1 +1 @@ -4.1.0.0-preview \ No newline at end of file +4.1.0.0-preview diff --git a/x2goserver-xsession/VERSION.x2goserver-xsession b/x2goserver-xsession/VERSION.x2goserver-xsession index 1667ae5..8a1136f 100644 --- a/x2goserver-xsession/VERSION.x2goserver-xsession +++ b/x2goserver-xsession/VERSION.x2goserver-xsession @@ -1 +1 @@ -4.1.0.0-preview \ No newline at end of file +4.1.0.0-preview diff --git a/x2goserver/VERSION.x2goserver b/x2goserver/VERSION.x2goserver index 1667ae5..8a1136f 100644 --- a/x2goserver/VERSION.x2goserver +++ b/x2goserver/VERSION.x2goserver @@ -1 +1 @@ -4.1.0.0-preview \ No newline at end of file +4.1.0.0-preview 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).