[X2go-Commits] x2godesktopsharing.git - master (branch) updated: 3.0.1.4-2-g6ffe45d

[X2Go dev team]

The branch, master has been updated
       via  6ffe45d50b3dacb1725e90a985e1876a6ed44c16 (commit)
      from  3faf29061e1775e6a0fb5d68fa66e5d804d4e393 (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 6ffe45d50b3dacb1725e90a985e1876a6ed44c16
Author: Milan Knížek <knizek.confy at gmail.com>
Date:   Tue May 8 09:36:15 2012 +0200

    Include <sys/unistd.h> in sharetray.cpp, fixes build on Ubuntu 12.10.

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

Summary of changes:
 debian/changelog |    4 +++-
 sharetray.cpp    |    1 +
 sharetray.h      |    1 -
 3 files changed, 4 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/changelog b/debian/changelog
index 4fc14c3..c7b821a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 x2godesktopsharing (3.0.1.5-0~x2go1) UNRELEASED; urgency=low
 
-  * Continue development...
+  [ Milan Knížek ]
+  * New upstream version (3.0.1.5):
+    - Include <sys/unistd.h> in sharetray.cpp, fixes build on Ubuntu 12.10.
 
  -- Mike Gabriel <mike.gabriel at das-netzwerkteam.de>  Wed, 22 Feb 2012 15:13:53 +0100
 
diff --git a/sharetray.cpp b/sharetray.cpp
index a019cce..926a5ed 100644
--- a/sharetray.cpp
+++ b/sharetray.cpp
@@ -19,6 +19,7 @@
 #include <QMessageBox>
 #include <QSocketNotifier>
 #include <sys/socket.h>
+#include <sys/unistd.h>
 #include "simplelocalsocket.h"
 #include "accessaction.h"
 #include <sys/types.h>
diff --git a/sharetray.h b/sharetray.h
index 71c792a..bc4ec19 100644
--- a/sharetray.h
+++ b/sharetray.h
@@ -14,7 +14,6 @@
 #include <QMainWindow>
 #include "ui_dlg.h"
 
-
 class QMenu;
 class QLocalServer;
 class SimpleLocalSocket;


hooks/post-receive
-- 
x2godesktopsharing.git (Desktop Sharing for X2Go)

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 "x2godesktopsharing.git" (Desktop Sharing for X2Go).