Merge pull request #3951 from ckamm/checksum
authorckamm <mail@ckamm.de>
Thu, 29 Oct 2015 09:40:24 +0000 (10:40 +0100)
committerckamm <mail@ckamm.de>
Thu, 29 Oct 2015 09:40:24 +0000 (10:40 +0100)
Checksums stored in database #3735

1  2 
src/libsync/owncloudpropagator.cpp
src/libsync/propagatedownload.cpp
src/libsync/propagateupload.cpp
src/libsync/syncengine.cpp
src/libsync/syncfileitem.h
src/libsync/syncjournalfilerecord.cpp

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge