nextcloud-desktop/src/libsync
Daniel Molkentin bb32831a60 Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir
Conflicts:
	src/gui/folderman.cpp
2014-07-17 11:31:45 +02:00
..
creds Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir 2014-07-17 11:31:45 +02:00
account.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
account.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
clientproxy.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
clientproxy.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
CMakeLists.txt Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
connectionvalidator.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
connectionvalidator.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
cookiejar.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
cookiejar.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
filesystem.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
filesystem.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
logger.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
logger.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
mirallaccessmanager.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
mirallaccessmanager.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
mirallconfigfile.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
mirallconfigfile.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
networkjobs.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
networkjobs.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudpropagator.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudpropagator.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudpropagator_p.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudtheme.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
owncloudtheme.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
progressdispatcher.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
progressdispatcher.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
propagator_legacy.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
propagator_legacy.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
propagator_qnam.cpp Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir 2014-07-17 11:31:45 +02:00
propagator_qnam.h Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir 2014-07-17 11:31:45 +02:00
propagatorjobs.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
propagatorjobs.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
quotainfo.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
quotainfo.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
syncengine.cpp Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir 2014-07-17 11:31:45 +02:00
syncengine.h Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir 2014-07-17 11:31:45 +02:00
syncfileitem.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
syncfilestatus.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
syncfilestatus.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
syncjournaldb.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
syncjournaldb.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
syncjournalfilerecord.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
syncjournalfilerecord.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
syncresult.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
syncresult.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
theme.cpp Merge remote-tracking branch 'origin/master' into move_lib_to_sep_dir 2014-07-17 11:31:45 +02:00
theme.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
utility.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
utility.h Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
utility_mac.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
utility_unix.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
utility_win.cpp Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00
version.h.in Split into three separate projects: library, gui and cmd 2014-07-11 11:07:31 +02:00