[X2Go-Commits] [python-x2go] 02/02: Merge branch 'brokerclient'

[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 python-x2go.

commit 26ad1cd3fcb4165ce631ffc22420f5acb6649ca5
Merge: e3ce176 a08fa96
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Fri Feb 7 13:31:17 2014 +0100

    Merge branch 'brokerclient'
    
    Conflicts (resolved by Mike Gabriel):
    	debian/changelog

 debian/changelog                                   |   13 ++
 python-x2go.spec                                   |    2 +-
 x2go/__init__.py                                   |    9 +-
 x2go/backends/control/__init__.py                  |    6 -
 x2go/backends/control/{_stdout.py => plain.py}     |   21 +--
 x2go/backends/info/__init__.py                     |    9 -
 x2go/backends/info/{_stdout.py => plain.py}        |   16 +-
 x2go/backends/printing/__init__.py                 |    9 -
 x2go/backends/printing/{_file.py => file.py}       |   11 +-
 x2go/backends/printing/{_gconf.py => gconf.py}     |    4 +-
 x2go/backends/printing/{_winreg.py => winreg.py}   |    6 +-
 x2go/backends/profiles/__init__.py                 |    9 -
 x2go/backends/profiles/{_file.py => base.py}       |  175 +++++++++++++-------
 x2go/backends/profiles/file.py                     |  110 ++++++++++++
 x2go/backends/profiles/{_gconf.py => gconf.py}     |    5 +-
 .../profiles/{_httpsbroker.py => httpbroker.py}    |   48 +++++-
 .../profiles/{_httpsbroker.py => sshbroker.py}     |    6 +-
 x2go/backends/profiles/{_winreg.py => winreg.py}   |    5 +-
 x2go/backends/proxy/__init__.py                    |    6 -
 x2go/backends/proxy/base.py                        |    4 +-
 x2go/backends/proxy/{_nx3.py => nx3.py}            |   12 +-
 x2go/backends/settings/__init__.py                 |    9 -
 x2go/backends/settings/{_file.py => file.py}       |   14 +-
 x2go/backends/settings/{_gconf.py => gconf.py}     |   10 +-
 x2go/backends/settings/{_winreg.py => winreg.py}   |    6 +-
 x2go/backends/terminal/__init__.py                 |    6 -
 x2go/backends/terminal/{_stdout.py => plain.py}    |   21 +--
 x2go/client.py                                     |  154 +++--------------
 x2go/defaults.py                                   |   93 +++++------
 x2go/inifiles.py                                   |   23 ++-
 x2go/printqueue.py                                 |    9 +-
 x2go/registry.py                                   |   42 ++---
 x2go/session.py                                    |   52 +++---
 x2go/utils.py                                      |   14 ++
 x2go/xserver.py                                    |    3 +-
 35 files changed, 490 insertions(+), 452 deletions(-)

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