Merge branch '3.6.x'

1 files changed, 0 insertions, 41 deletions

diff --git a/debian/patches/0209_x2goagent_add-man-page.full.patch b/debian/patches/0209_x2goagent_add-man-page.full.patch
deleted file mode 100644
index ad536994f..000000000
--- a/debian/patches/0209_x2goagent_add-man-page.full.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Add x2goagent man page
-Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
-
---- /dev/null
-+++ b/nx-X11/programs/Xserver/hw/nxagent/man/x2goagent.1
-@@ -0,0 +1,35 @@
-+.TH x2goagent 1
-+.SH NAME
-+x2goagent \- X2Go Agent.
-+.SH SYNOPSIS
-+.B x2goagent
-+.I "[options]"
-+
-+.SH DESCRIPTION
-+\fBx2goagent\fR is an Xnest-like X server for remote application/desktop access.
-+.PP
-+\fBx2goagent\fR implements a very efficient compression of the X11 protocol.
-+.PP
-+This increases performance when using X applications over high latency and
-+low bandwidth networks, while providing a local (LAN-like) usage experience
-+even if connecting from off-site locations (via cable modem or GSM).
-+.PP
-+\fBx2goagent\fR is not designed to be used as a standalone application.
-+It has to be launched on the server side by the X2Go server software.
-+.PP
-+Available clients are
-+\fBx2goclient\fR, \fBpyhoca-gui\fR and \fBpyhoca-gui\fR (using the
-+Python X2Go API).
-+
-+.SH OPTIONS
-+.TP
-+.B \-help
-+Lists all others options that are not listed here.
-+
-+.SH FURTHER READINGS
-+Information on X2Go: http://wiki.x2go.org
-+.PP
-+Information on NX: http://www.nomachine.com
-+
-+.SH AUTHOR
-+This manual page was written by Mike Gabriel <mike.gabriel@das-netzwerkteam.de>.