[X2Go-Commits] python-x2go.git - brokerclient (branch) updated: 0.0.39.0-101-g82b51c2

X2Go dev team git-admin at x2go.org
Tue Jan 7 16:20:21 CET 2014


The branch, brokerclient has been updated
       via  82b51c2f7ed70812ec1d1995528fbab6ff21aca8 (commit)
      from  41af62aa15fa8162faea5705c2a60c845ca253c8 (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 -----------------------------------------------------------------
-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    6 ------
 1 file changed, 6 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index ba89a24..4cb54de 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
 python-x2go (0.0.40.0-0~nwt1) natty lucid maverick stable testing unstable; urgency=low
 
   * new upstream features (0.0.40.0):
-<<<<<<< HEAD
       - fixing false HOOK_* notifications
       - work on Windows subprocess creation
       - gsprint.exe path now configurable
@@ -9,11 +8,6 @@ python-x2go (0.0.40.0-0~nwt1) natty lucid maverick stable testing unstable; urge
       - hard-coded file extension blacklist for X2goDropbox
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Thu, 10 Mar 2011 23:57:00 +0100
-=======
-      - EMPTY
-
- -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Tue, 1 Mar 2011 00:32:00 +0100
->>>>>>> 0.0.40.0
 
 python-x2go (0.0.39.0-0~nwt1) natty lucid maverick stable testing unstable; urgency=low
 


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).




More information about the x2go-commits mailing list