nextcloud-desktop/test
Christian Kamm 53d5de685c Merge remote-tracking branch 'origin/1.7'
Conflicts:
	src/gui/folder.cpp
	src/gui/folder.h
	src/libsync/networkjobs.cpp
	src/libsync/owncloudpropagator.h
	src/libsync/propagatedownload.cpp
2014-12-10 13:01:36 +01:00
..
manual/favlink Fix tests 2014-11-09 22:37:56 +01:00
scripts Fix tests 2014-11-09 22:37:56 +01:00
CMakeLists.txt Merge remote-tracking branch 'origin/1.7' 2014-11-19 14:45:25 +01:00
main.cpp.in
owncloud_add_test.cmake Fix tests 2014-08-27 10:27:29 +02:00
test_journal.db
testcsyncsqlite.h tests: Fix CSync Journal test, use real CSYNC struct from csync_private. 2014-10-27 13:15:33 +01:00
testfolder.h Fix tests 2014-11-09 22:37:56 +01:00
testfolderwatcher.h Merge branch 'master' into rename_client 2014-12-02 13:37:22 +01:00
testinotifywatcher.h Fix tests 2014-11-09 22:37:56 +01:00
testnetrcparser.h Fix tests 2014-11-09 22:37:56 +01:00
testowncloudpropagator.h
testownsql.h Merge remote-tracking branch 'origin/1.7' 2014-12-10 13:01:36 +01:00
testplan.txt
testsyncjournaldb.h Fix tests 2014-11-09 22:37:56 +01:00
testupdater.h Fix tests 2014-11-09 22:37:56 +01:00
testutility.h Fix tests 2014-11-09 22:37:56 +01:00