Merge branch 'master' of github.com:openscad/openscad into issue11_2

Conflicts:
	RELEASE_NOTES
	openscad.pro
	src/mainwin.cc

1 files changed, 32 insertions, 0 deletions

diff --git a/src/SparkleAutoUpdater.h b/src/SparkleAutoUpdater.h
new file mode 100644
index 0000000..786a190
--- /dev/null
+++ b/src/SparkleAutoUpdater.h
@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2008 Remko Troncon. BSD license
+ * Copyright (C) 2013 Marius Kintel. BSD license
+ */
+#ifndef SPARKLEAUTOUPDATER_H
+#define SPARKLEAUTOUPDATER_H
+
+#include <QString>
+
+#include "AutoUpdater.h"
+
+class SparkleAutoUpdater : public AutoUpdater
+{
+public:
+	SparkleAutoUpdater();
+	~SparkleAutoUpdater();
+	
+	void checkForUpdates();
+	void setAutomaticallyChecksForUpdates(bool on);
+	bool automaticallyChecksForUpdates();
+	void setEnableSnapshots(bool on);
+	bool enableSnapshots();
+	QString lastUpdateCheckDate();
+
+private:
+	void updateFeed();
+
+	class Private;
+	Private *d;
+};
+
+#endif