Merge branch 'master' into epec-kernel

Conflicts:
	src/PolySetCGALEvaluator.cc

1 files changed, 1 insertions, 1 deletions

diff --git a/src/MainWindow.h b/src/MainWindow.h
index a4835c2..8745b8b 100644
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@@ -74,7 +74,6 @@ private slots:
 private:
 	void openFile(const QString &filename);
 	void refreshDocument();
-	AbstractNode *find_root_tag(AbstractNode *n);
 	void updateTemporalVariables();
 	bool fileChangedOnDisk();
 	bool includesChanged();
@@ -91,6 +90,7 @@ private:
   class QMessageBox *openglbox;
 
 private slots:
+	void actionUpdateCheck();
 	void actionNew();
 	void actionOpen();
 	void actionOpenRecent();