Christian Kamm 53d5de685c Merge remote-tracking branch 'origin/1.7' ... Conflicts: src/gui/folder.cpp src/gui/folder.h src/libsync/networkjobs.cpp src/libsync/owncloudpropagator.h src/libsync/propagatedownload.cpp		2014-12-10 13:01:36 +01:00
..
MacOSX	…
dolphin	…
icons	…
nautilus	…
testclient	…
windows/OCShellExtensions	…
CMakeLists.txt	…