This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository x2goclient. from cd1ae31 Fix placement of session folders in session card column. new b2bcdca Continue development... new cda48ed fix changelog cherry-picking and add closure for #681 The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: VERSION | 2 +- debian/changelog | 11 +++++++++-- man/man1/x2goclient.1 | 2 +- version.h | 2 +- x2goclient.spec | 2 +- x2goplugin.rc | 10 +++++----- 6 files changed, 18 insertions(+), 11 deletions(-) -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit b2bcdca4be70a7528434ed81d9b41622331ed8e8 Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Nov 27 12:01:54 2014 +0100 Continue development... --- VERSION | 2 +- debian/changelog | 6 ++++++ man/man1/x2goclient.1 | 2 +- version.h | 2 +- x2goclient.spec | 2 +- x2goplugin.rc | 10 +++++----- 6 files changed, 15 insertions(+), 9 deletions(-) diff --git a/VERSION b/VERSION index 7d026e9..8ac115c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.3.1 +4.0.3.2 diff --git a/debian/changelog b/debian/changelog index cb576b8..dd0d1cb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium + + * Continue development... + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 + x2goclient (4.0.3.1-0x2go1) unstable; urgency=medium [ Mike Gabriel ] diff --git a/man/man1/x2goclient.1 b/man/man1/x2goclient.1 index c69f633..d785e9a 100644 --- a/man/man1/x2goclient.1 +++ b/man/man1/x2goclient.1 @@ -5,7 +5,7 @@ \\$2 \(la\\$1\(ra\\$3 .. .if \n(.g .mso www.tmac -.TH x2goclient 1 "Oct 2014" "Version 4.0.3.1" "X2Go Client (Qt4)" +.TH x2goclient 1 "Dec 2014" "Version 4.0.3.2" "X2Go Client (Qt4)" .SH NAME x2goclient \- Client application to launch server-side X2Go sessions. .SH SYNOPSIS diff --git a/version.h b/version.h index 2c10b79..a16dd69 100644 --- a/version.h +++ b/version.h @@ -15,5 +15,5 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * ***************************************************************************/ -#define VERSION "4.0.3.1" +#define VERSION "4.0.3.2" diff --git a/x2goclient.spec b/x2goclient.spec index ed50484..7b64f8a 100644 --- a/x2goclient.spec +++ b/x2goclient.spec @@ -1,5 +1,5 @@ Name: x2goclient -Version: 4.0.3.1 +Version: 4.0.3.2 Release: 0.0x2go1%{?dist} Summary: X2Go Client application (Qt4) diff --git a/x2goplugin.rc b/x2goplugin.rc index 46a8962..1448a53 100644 --- a/x2goplugin.rc +++ b/x2goplugin.rc @@ -1,8 +1,8 @@ 1 TYPELIB "x2goplugin.rc" 1 VERSIONINFO - FILEVERSION 4.0.3.1 - PRODUCTVERSION 4.0.3.1 + FILEVERSION 4.0.3.2 + PRODUCTVERSION 4.0.3.2 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -21,13 +21,13 @@ BEGIN VALUE "FileDescription", "Allows you to start X2Go session in a webbrowser\0" VALUE "FileExtents", "x2go\0" VALUE "FileOpenName", "Configuration File for X2Go Session (*.x2go)\0" - VALUE "FileVersion", "4, 0, 3 ,1\0" + VALUE "FileVersion", "4, 0, 3 ,2\0" VALUE "InternalName", "x2goplugin\0" VALUE "LegalCopyright", "Copyright � 2010-2014 X2Go Project\0" VALUE "MIMEType", "application/x2go\0" VALUE "OriginalFilename", "npx2goplugin.dll\0" - VALUE "ProductName", "X2GoClient Plug-in 4.0.3.1\0" - VALUE "ProductVersion", "4, 0, 3, 1\0" + VALUE "ProductName", "X2GoClient Plug-in 4.0.3.2\0" + VALUE "ProductVersion", "4, 0, 3, 2\0" END END BLOCK "VarFileInfo" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goclient. commit cda48ed87127646fc5823f9179256fb3a7772c3c Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Thu Nov 27 12:03:25 2014 +0100 fix changelog cherry-picking and add closure for #681 --- debian/changelog | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index dd0d1cb..fc5fa08 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ x2goclient (4.0.3.2-0x2go1) UNRELEASED; urgency=medium - * Continue development... + [ Oleksandr Shneyder ] + * New upstream release (4.0.3.2): + - Reformat onmainwindow.cpp + - Fix placement of session folders in session card column. (Fixes: #681). -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 12:01:43 +0100 @@ -25,8 +28,6 @@ x2goclient (4.0.3.1-0x2go1) unstable; urgency=medium * New upstream release (4.0.3.1): - Split Sessions config widget into Input/output and Media widgets. (Fixes: #643). - - Reformat onmainwindow.cpp - - Fix placement of session folders in session card column. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Thu, 27 Nov 2014 11:00:17 +0100 -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git
-
git-admin＠x2go.org