Merge branch 'master' into propagator-ng

This just fix the conflict.
Do not compile or work yet

Conflicts:
	src/CMakeLists.txt
	src/mirall/csyncthread.cpp
	src/mirall/csyncthread.h
	src/mirall/owncloudfolder.cpp
	src/mirall/syncfileitem.h
	test/CMakeLists.txt

1 files changed, 11 insertions, 3 deletions

diff --git a/src/mirall/syncfileitem.h b/src/mirall/syncfileitem.h
index 55489e900..67a59c6cf 100644
--- a/src/mirall/syncfileitem.h
+++ b/src/mirall/syncfileitem.h
@@ -13,9 +13,16 @@ namespace Mirall {
 class SyncFileItem {
 public:
     typedef enum {
-        None = 0,
-        Up,
-        Down } Direction;
+      None = 0,
+      Up,
+      Down } Direction;
+
+    typedef enum {
+      UnknownType,
+      File,
+      Directory,
+      SoftLink
+    } Type;
 
     SyncFileItem() {}
 
@@ -58,6 +65,7 @@ public:
     QString _errorDetail;
     int     _httpCode;
 
+    Type      _type;
 };