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
..
OCOverlays	Revert "Windows Shell Integration: Show status icon for root folder"	2014-11-06 15:18:54 +01:00
OCUtil	Windows shell integration: Always release the lock before calling win32 API	2014-12-03 09:11:38 +01:00
OCShellExtensions.sln	Support for multiple icons	2014-08-04 15:40:08 +02:00