Daniel Molkentin
|
3016844dd7
|
Merge branch 'master' into rename_client
Conflicts:
README.md
src/gui/folderman.cpp
src/gui/settingsdialog.cpp
src/libsync/accessmanager.cpp
src/libsync/propagateupload.h
|
2014-12-02 13:37:22 +01:00 |
|
Olivier Goffart
|
ad92e7b888
|
Move UploadDevice to the right header
|
2014-11-14 16:40:13 +01:00 |
|
Olivier Goffart
|
c73522de2e
|
Remove ChunkBlock
It is not in used
|
2014-11-14 16:39:39 +01:00 |
|
Daniel Molkentin
|
281c0e1553
|
Merge branch 'master' into rename_client
Conflicts:
CMakeLists.txt
src/gui/main.cpp
src/libsync/accessmanager.cpp
src/libsync/accessmanager.h
src/libsync/owncloudpropagator_p.h
|
2014-11-12 00:07:59 +01:00 |
|
Olivier Goffart
|
506ba022f1
|
Split propagator_qnam.cpp into propagateupload.cpp and propagatedownload.cpp
|
2014-11-11 12:17:10 +01:00 |