[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.3.0-3-g1412f5a
X2Go dev team
git-admin at x2go.org
Tue Nov 13 16:12:39 CET 2012
The branch, master has been updated
via 1412f5a6d4031ef191caa5cc1c3f8be870552b30 (commit)
from f0ca7844d47e92513f9230a40a7fea04e614ead5 (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 -----------------------------------------------------------------
commit 1412f5a6d4031ef191caa5cc1c3f8be870552b30
Author: Jan Engelhardt <jengelh at inai.de>
Date: Tue Nov 13 16:11:09 2012 +0100
Fix Debian-like Qt path (qmake will handle it internally).
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 4 ++++
sshmasterconnection.cpp | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 70da021..06cb0fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ x2goclient (3.99.3.1-0~x2go1) UNRELEASED; urgency=low
* New upstream version (3.99.3.1):
- Update Danish translation.
+ [ Jan Engelhardt ]
+ * New upstream version (3.99.3.1):
+ - Fix Debian-like Qt path (qmake will handle it internally).
+
-- Mike Gabriel <mike.gabriel at das-netzwerkteam.de> Wed, 07 Nov 2012 16:26:49 +0100
x2goclient (3.99.3.0-0~x2go1) unstable; urgency=low
diff --git a/sshmasterconnection.cpp b/sshmasterconnection.cpp
index 35b89c7..5a23989 100644
--- a/sshmasterconnection.cpp
+++ b/sshmasterconnection.cpp
@@ -42,7 +42,7 @@
#include <arpa/inet.h> /* for sockaddr_in and inet_addr() */
#include <arpa/inet.h>
#include <netinet/tcp.h>
-#include <qt4/QtNetwork/qabstractsocket.h>
+#include <QtNetwork/qabstractsocket.h>
#endif
hooks/post-receive
--
x2goclient.git (X2Go Client)
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 "x2goclient.git" (X2Go Client).
More information about the x2go-commits
mailing list