Merge branch '3.6.x'

1 files changed, 0 insertions, 31 deletions

diff --git a/debian/x2goagent.options b/debian/x2goagent.options
deleted file mode 100644
index bd19c414e..000000000
--- a/debian/x2goagent.options
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# This file can be used to specify default options that are passed to nxagent.
-#
-# These options can be overriden by the client!
-#
-# See the output of `nxagent -help` for the full list of options.
-#
-# Remember:
-# "-extension" disables an extension.
-# "+extension" enables an extension.
-
-X2GO_NXAGENT_DEFAULT_OPTIONS=""
-
-# Uncomment to disable GLX, the old mesa version is hopelessly outdated anyways.
-# Unbreaks the gnome3 control center
-#
-#X2GO_NXAGENT_DEFAULT_OPTIONS+=" -extension GLX"
-
-# Launch X2Go's X-server x2goagent with option "-nolisten tcp".
-#
-# This is the default setting and the X2Go developers really recommend not to
-# touch this. However, if you play with this (i.e. if you comment it out) you
-# should really know what you are doing.
-#
-# For everyone else: don't touch the line below!!!
-X2GO_NXAGENT_DEFAULT_OPTIONS+=" -nolisten tcp"
-
-# Enforce clipboard behaviour in X2Go sessions globally (for all connecting clients)
-# Possible values for the -clipboard option: both, server, client, none
-# If this option stays commented out, clients can choose the sessions' clipboard behaviour...
-#X2GO_NXAGENT_DEFAULT_OPTIONS+=" -clipboard both"