The branch, master has been updated via 60d5a88d02fbf006f76219e8aae57e0d9a081eee (commit) from 187ce289743a817b1b11e1422e37a4b8968df03e (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 60d5a88d02fbf006f76219e8aae57e0d9a081eee Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Date: Fri Aug 17 16:29:23 2012 +0200 Continue development... Conflicts (resolved by Mike Gabriel): debian/changelog ----------------------------------------------------------------------- Summary of changes: debian/changelog | 6 ++++++ x2go/__init__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index ae02401..314e62f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-x2go (0.2.0.10-0~x2go1) UNRELEASED; urgency=low + + * Continue development... + + -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Fri, 17 Aug 2012 18:29:04 +0200 + python-x2go (0.2.0.9-0~x2go2) unstable; urgency=low * Make sure we can build against python-gevent provided on diff --git a/x2go/__init__.py b/x2go/__init__.py index 11643bf..706d488 100644 --- a/x2go/__init__.py +++ b/x2go/__init__.py @@ -178,7 +178,7 @@ Contact """ __NAME__ = 'python-x2go' -__VERSION__ = '0.2.0.9' +__VERSION__ = '0.2.0.10' from gevent import monkey monkey.patch_all() hooks/post-receive -- python-x2go.git (Python X2Go Client API) 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 "python-x2go.git" (Python X2Go Client API).