[X2go-Commits] x2goclient.git - master (branch) updated: 3.99.1.0-2-gc56b99a

X2go dev team git-admin at x2go.org
Wed Feb 22 16:21:31 CET 2012


The branch, master has been updated
       via  c56b99a96b23d2978231b5d3a892b658a727e363 (commit)
      from  4375d10a6834c67ddf638ea52a121d8e04840a0a (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 c56b99a96b23d2978231b5d3a892b658a727e363
Author: Oleksandr Shneyder <oleksandr.shneyder at treuchtlingen.de>
Date:   Wed Feb 22 16:20:42 2012 +0100

    Not including <netinet/in.h> on Q_OS_WIN platform.

-----------------------------------------------------------------------

Summary of changes:
 config_win.bat   |    1 +
 debian/changelog |    4 +++-
 sshprocess.h     |    5 ++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/config_win.bat b/config_win.bat
index 98f1987..695b3e2 100755
--- a/config_win.bat
+++ b/config_win.bat
@@ -1,4 +1,5 @@
 mingw32-make distclean
+lrelease x2goclient.pro
 set X2GO_CLIENT_TARGET=
 qmake
 
diff --git a/debian/changelog b/debian/changelog
index ecede52..ceeed80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 x2goclient (3.99.1.1-0~x2go1) UNRELEASED; urgency=low
 
-  * Continue development...
+  [ Oleksandr Shneyder ]
+  * New upstream version (3.99.1.1):
+    - not including <netinet/in.h> on Q_OS_WIN platform.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 22 Feb 2012 15:11:58 +0100
 
diff --git a/sshprocess.h b/sshprocess.h
index 9d7a2b1..54e94b5 100644
--- a/sshprocess.h
+++ b/sshprocess.h
@@ -22,10 +22,13 @@
 #ifndef SSHPROCESS_H
 #define SSHPROCESS_H
 
-#include <netinet/in.h>
 #include <libssh/libssh.h>
 #include <QObject>
 
+#ifndef Q_OS_WIN
+#include <netinet/in.h>
+#endif
+
 class SshMasterConnection;
 
 


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