Merge from branch 3.0

2011-02-07 23:40:11 +01:00
commit 6ad7d458c9
628 changed files with 131277 additions and 0 deletions
--- a/rtengine/simpleprocess.h
+++ b/rtengine/simpleprocess.h
@@ -0,0 +1,26 @@
+/* 
+ * File:   simpleprocess.h
+ * Author: askv
+ *
+ * Created on September 18, 2010, 8:31 PM
+ */
+
+#ifndef SIMPLEPROCESS_H
+#define	SIMPLEPROCESS_H
+
+#ifdef	__cplusplus
+extern "C" {
+#endif
+
+    
+
+
+#ifdef	__cplusplus
+}
+#endif
+namespace rtengine {
+
+extern Glib::Thread *batchThread;
+}
+#endif	/* SIMPLEPROCESS_H */
+