[X2Go-Commits] [x2goserver] 01/02: Continue development on LTS release branch...

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit adf494bf317ac513c781f172da788b7ac97ff44a
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jan 7 18:43:39 2014 +0100

    Continue development on LTS release 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
---
 debian/changelog |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9850a69..0e9acb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -285,6 +285,12 @@ 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.11-0x2go1) UNRELEASED; urgency=low
+
+  * Continue development on LTS release branch...
+
+ -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 07 Jan 2014 18:43:03 +0100
+
 x2goserver (4.0.0.10-0x2go1) unstable; urgency=low
 
   * New upstream version (4.0.0.10):

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goserver.git