some updates and fixes

diff --git a/Makefile b/Makefile
index 0387b80..afa0de1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,7 @@ taurus:
        cp -a taurus/lib/* bin/
        -cp -a taurus/aurora/gpg/bin/gpg bin/
        -cp -a taurus/aurora/gpg/bin/gpg.exe bin/
-       cp -a taurus/aurora/gpg/lib/* bin/
+       -cp -a taurus/aurora/gpg/lib/* bin/
 
 tzone:
        cd tzone && $(QMAKE) $(QMCFG) $(QMAKEFLAGS) && $(MAKE)
@@ -162,6 +162,7 @@ clean:
        -$(MAKE) -C pack clean
        -$(MAKE) -C taurus clean
        -$(MAKE) -C mainapp clean
+       -$(MAKE) -C plugins clean
        -rm -rf tzone/zoneinfo* tzone/libQtTzData* tzone/Makefile* tzone/.ctmp
        -rm -rf doc/source-php doc/source-cpp
        -rm -rf taurus/lib/*

diff --git a/src/mwin/overview.h b/src/mwin/overview.h
index d6d4b63..e226436 100644 (file)
--- a/src/mwin/overview.h
+++ b/src/mwin/overview.h
@@ -21,6 +21,8 @@
 
 #include "tabwin.h"
 
+#include <functional>
+
 class QAction;
 class QCheckBox;
 class QComboBox;

diff --git a/taurus b/taurus
index ebe25da..0665187 160000 (submodule)
--- a/taurus
+++ b/taurus
@@ -1 +1 @@
-Subproject commit ebe25da7addeeb1fe4a2bde9dc09b2b461011d06
+Subproject commit 0665187335a4a950ef2d02da1f2880770518a4bb

diff --git a/tzone b/tzone
index c9199d9..0c4c238 160000 (submodule)
--- a/tzone
+++ b/tzone
@@ -1 +1 @@
-Subproject commit c9199d9dc5af228c41967d303cbc323e7532435d
+Subproject commit 0c4c238df569cbbcf8ba50839d1ff0311fbcd17d