[X2Go-Commits] [x2goserver] 02/02: TERMINAL Session: Add support for qterminal

[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 x2goserver.

commit e68165a741cd234f45af286397926d1d97f3b8c5
Author: Mike DePaulo <mikedep333 at gmail.com>
Date:   Sat Mar 7 07:55:09 2015 -0500

    TERMINAL Session: Add support for qterminal
    
    Conflicts:
    	debian/changelog
---
 debian/changelog              |    4 +++-
 x2goserver/bin/x2goruncommand |    2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 645ba52..f2f81a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -168,8 +168,10 @@ x2goserver (4.1.0.0-0x2go1.1) UNRELEASED; urgency=low
 
 x2goserver (4.0.1.20-0x2go1) UNRELEASED; urgency=low
 
+  [ Mike DePaulo ]
   * New upstream version (4.0.1.20):
-    - Continue development...
+    - TERMINAL Session: Add support for qterminal
+      (Lightweight terminal emulator written in Qt)
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 24 Feb 2015 22:11:49 +0100
 
diff --git a/x2goserver/bin/x2goruncommand b/x2goserver/bin/x2goruncommand
index e7e20e2..ac7ff7f 100755
--- a/x2goserver/bin/x2goruncommand
+++ b/x2goserver/bin/x2goruncommand
@@ -249,6 +249,8 @@ if [ "$cmd" == "TERMINAL" ]; then
 		cmd="/usr/bin/gnome-terminal"
 	elif  [ -e "/usr/bin/lxterminal" ]; then
 		cmd="/usr/bin/lxterminal"
+	elif  [ -e "/usr/bin/qterminal" ]; then
+		cmd="/usr/bin/qterminal"
 	elif  [ -e "/usr/bin/rxvt" ]; then
 		cmd="/usr/bin/rxvt"
 	elif  [ -e "/usr/bin/xterm" ]; then

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