The branch, twofactorauth has been updated via 29e4a2a0c4ce194601992bc0e3e0dd9528dd9394 (commit) from ee383080755920c5078dbbba0de336939f83c467 (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 | 2 ++ x2go/defaults.py | 7 +++++++ 2 files changed, 9 insertions(+) The diff of changes is: diff --git a/debian/changelog b/debian/changelog index f23f549..33797eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -60,6 +60,8 @@ python-x2go (0.1.2.0-0~x2go1) UNRELEASED; urgency=low defaults.py. - For the Windows version, make shipped VcXsrv-Server known to Python X2Go. The shipped VcXsrv has to rest in $CLIENTAPPDIR/VcXsrv/vcxsrv.exe. + - For the Windows version, make VcXsrv-Server at the development location + known to Python X2Go. * Depend on python-xlib. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 28 Sep 2012 01:44:21 +0100 diff --git a/x2go/defaults.py b/x2go/defaults.py index 5f3939a..4c0705e 100644 --- a/x2go/defaults.py +++ b/x2go/defaults.py @@ -262,6 +262,13 @@ if X2GOCLIENT_OS == 'Windows': 'run_command': os.path.join(os.getcwd(), 'VcXsrv', 'vcxsrv.exe'), 'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill', '-swcursor', ], }, + 'VcXsrv_development': { + 'display': 'localhost:40', + 'process_name': 'vcxsrv.exe', + 'test_installed': os.path.join(os.getcwd(), '..', 'pyhoca-contrib', 'mswin', 'vcxsrv-mswin', 'VcXsrv-1.11.4.0', 'vcxsrv.exe'), + 'run_command': os.path.join(os.getcwd(), '..', 'pyhoca-contrib', 'mswin', 'vcxsrv-mswin', 'VcXsrv-1.11.4.0', 'vcxsrv.exe'), + 'parameters': [':40', '-clipboard', '-multiwindow', '-notrayicon', '-nowinkill', '-nounixkill', '-swcursor', ], + }, 'Xming': { 'display': 'localhost:40', 'process_name': 'Xming.exe', 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).