Merge branch 'master' of git://github.com/mbruker/Cockatrice into devel

servatrice/src/server_logger.cpp

@@ -7,6 +7,7 @@
 #ifdef Q_OS_UNIX
 # include <sys/types.h>
 # include <sys/socket.h>
+# include <unistd.h>
 #endif
 
 ServerLogger::ServerLogger(bool _logToConsole, QObject *parent)