Olivier Goffart 0589bfc51b Merge branch 'master' into propagator-ng ... This just fix the conflict. Do not compile or work yet Conflicts: src/CMakeLists.txt src/mirall/csyncthread.cpp src/mirall/csyncthread.h src/mirall/owncloudfolder.cpp src/mirall/syncfileitem.h test/CMakeLists.txt		2013-08-14 15:19:21 +02:00
..
manual/favlink	Fix favlink manual test	2013-03-25 18:00:25 +01:00
scripts	torture scripts: fix description	2013-06-06 11:05:21 +02:00
CMakeLists.txt	Merge branch 'master' into propagator-ng	2013-08-14 15:19:21 +02:00
main.cpp.in	Add testing skeleton	2012-10-26 20:24:12 +02:00
owncloud_add_test.cmake	Revert "run tests verbosely"	2013-08-09 14:45:49 +02:00
testowncloudpropagator.h	Created a test file for ownCloudPropagator. Not much in yet.	2013-05-05 12:36:42 +02:00
testplan.txt	Added a testplan to test systematically.	2012-04-18 12:00:29 +02:00
testutility.h	Add tests for Utility namespace	2013-08-09 13:09:41 +02:00