Daniel Molkentin c3468b7ed6 Merge remote-tracking branch 'origin/master' into accountstate ... Conflicts: src/gui/owncloudsetupwizard.cpp src/gui/owncloudsetupwizard.h src/libsync/propagatedownload.cpp src/libsync/propagatedownload.h		2015-01-08 15:33:39 +01:00
..
creds
accessmanager.cpp
accessmanager.h
account.cpp
account.h
accountfwd.h
authenticationdialog.cpp
authenticationdialog.h
bandwidthmanager.cpp
bandwidthmanager.h
clientproxy.cpp
clientproxy.h
CMakeLists.txt
configfile.cpp
configfile.h
connectionvalidator.cpp
connectionvalidator.h
cookiejar.cpp
cookiejar.h
discoveryphase.cpp
discoveryphase.h
filesystem.cpp
filesystem.h
logger.cpp
logger.h
networkjobs.cpp
networkjobs.h
owncloudpropagator.cpp
owncloudpropagator.h
owncloudpropagator_p.h
owncloudtheme.cpp
owncloudtheme.h
ownsql.cpp
ownsql.h
progressdispatcher.cpp	potential fix for #1865	2015-01-08 11:42:14 +01:00
progressdispatcher.h	potential fix for #1865	2015-01-08 11:42:14 +01:00
propagatedownload.cpp	Merge remote-tracking branch 'origin/master' into accountstate	2015-01-08 15:33:39 +01:00
propagatedownload.h	Merge remote-tracking branch 'origin/master' into accountstate	2015-01-08 15:33:39 +01:00
propagateremotedelete.cpp
propagateremotedelete.h
propagateremotemkdir.cpp
propagateremotemkdir.h
propagateremotemove.cpp
propagateremotemove.h
propagateupload.cpp	Merge remote-tracking branch 'origin/master' into accountstate	2015-01-08 15:33:39 +01:00
propagateupload.h
propagator_legacy.cpp
propagator_legacy.h
propagatorjobs.cpp
propagatorjobs.h
syncengine.cpp	Merge remote-tracking branch 'origin/master' into accountstate	2015-01-08 15:33:39 +01:00
syncengine.h
syncfileitem.h
syncfilestatus.cpp
syncfilestatus.h
syncjournaldb.cpp
syncjournaldb.h
syncjournalfilerecord.cpp
syncjournalfilerecord.h
syncresult.cpp
syncresult.h
theme.cpp	Add hack to make old themes work	2015-01-08 14:21:58 +01:00
theme.h
utility.cpp
utility.h
utility_mac.cpp
utility_unix.cpp
utility_win.cpp
version.h.in