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
..
csync_tests	Ignore reserved words on Windows	2014-10-24 13:18:57 -04:00
encoding_tests	Add missing license headers in tests	2014-02-24 11:08:58 +01:00
httpbf_tests	Add missing license headers in tests	2014-02-24 11:08:58 +01:00
log_tests	Add missing license headers in tests	2014-02-24 11:08:58 +01:00
ownCloud	Merge branch 'master' into rename_client	2014-12-02 13:37:22 +01:00
std_tests	CSync: Remove unused std functions	2014-06-04 10:33:19 +02:00
vio_tests	csync: Remove outdated tests	2014-02-28 16:43:15 +01:00
CMakeLists.txt	CSync: Remove unused std functions	2014-06-04 10:33:19 +02:00
cmdline.c	Add missing license headers in tests	2014-02-24 11:08:58 +01:00
torture.c	Add missing license headers in tests	2014-02-24 11:08:58 +01:00
torture.h	Add missing license headers in tests	2014-02-24 11:08:58 +01:00
valgrind-csync.supp	…