Olivier Goffart 50e718b1e7 Merge branch '1.7' ... Conflicts: src/CMakeLists.txt src/cmd/cmd.cpp src/gui/folder.cpp src/gui/socketapi.cpp translations/mirall_ca.ts translations/mirall_cs.ts translations/mirall_de.ts translations/mirall_el.ts translations/mirall_en.ts translations/mirall_es.ts translations/mirall_es_AR.ts translations/mirall_et.ts translations/mirall_eu.ts translations/mirall_fa.ts translations/mirall_fi.ts translations/mirall_fr.ts translations/mirall_gl.ts translations/mirall_hu.ts translations/mirall_it.ts translations/mirall_ja.ts translations/mirall_nl.ts translations/mirall_pl.ts translations/mirall_pt.ts translations/mirall_pt_BR.ts translations/mirall_ru.ts translations/mirall_sk.ts translations/mirall_sl.ts translations/mirall_sv.ts translations/mirall_th.ts translations/mirall_tr.ts translations/mirall_uk.ts translations/mirall_zh_CN.ts translations/mirall_zh_TW.ts		2014-09-18 17:10:21 +02:00
..
manual/favlink	Split into three separate projects: library, gui and cmd	2014-07-11 11:07:31 +02:00
scripts	Add missing license headers in tests	2014-02-24 11:08:58 +01:00
CMakeLists.txt	Merge branch '1.7'	2014-09-18 17:10:21 +02:00
main.cpp.in	Add testing skeleton	2012-10-26 20:24:12 +02:00
owncloud_add_test.cmake	Fix tests	2014-08-27 10:27:29 +02:00
test_journal.db	Add new test to test the csync database code.	2014-03-20 11:15:28 +01:00
testcsyncsqlite.h	Tests: Fixed the CSync statedb test defined in the mirall module.	2014-08-15 18:33:04 +02:00
testfolder.h	Fix tests	2014-08-27 10:27:29 +02:00
testfolderwatcher.h	Split into three separate projects: library, gui and cmd	2014-07-11 11:07:31 +02:00
testinotifywatcher.h	Split into three separate projects: library, gui and cmd	2014-07-11 11:07:31 +02:00
testnetrcparser.h	Allow passing user/pass explicitly or via netrc	2014-09-16 23:52:28 +02:00
testowncloudpropagator.h	Fix compilation of the owncloudpropagator test	2014-01-20 15:44:43 +01:00
testplan.txt	Added a testplan to test systematically.	2012-04-18 12:00:29 +02:00
testupdater.h	Updater: More tests	2014-01-29 12:01:35 +01:00
testutility.h	Split into three separate projects: library, gui and cmd	2014-07-11 11:07:31 +02:00