111 commits

Author	SHA1	Message	Date
Olivier Goffart	869793592d	Merge branch '1.5' ... Conflicts: VERSION.cmake src/mirall/owncloudpropagator.cpp src/mirall/owncloudpropagator.h	2014-02-27 11:40:34 +01:00
Olivier Goffart	1e43d1fa49	Add missing license headers in tests ... LGPL for csync tests, GPL for mirall tests	2014-02-24 11:08:58 +01:00
Olivier Goffart	93f31fa9d7	Merge branch '1.5'	2014-02-12 16:44:24 +01:00
Olivier Goffart	1a9a14bdec	Fix problems if a file is moved, and another file is created with the same name	2014-02-12 13:44:32 +01:00
Klaas Freitag	b84253054a	Read configuration from /etc/ownCloud/t1.cfg	2014-02-10 15:08:40 +01:00
Olivier Goffart	ee3df45fd8	remove csync_lock ... It is not used anymore for a long time	2014-02-05 17:31:34 +01:00
Olivier Goffart	94190b73ff	fix test compilation	2014-01-26 19:05:43 +01:00
Olivier Goffart	2eb9962f4c	Adapt the test to the changes in the exclude list ... The exclude list was removed from csync in commit f32d901653 Adapt the test.	2014-01-26 18:58:56 +01:00
Olivier Goffart	5119d5d366	Remove csync_config ... commit c585c73044 removed the use of it. So remove this code completely as it is no longer used	2014-01-26 18:39:47 +01:00
Olivier Goffart	c7227297af	Make it compile with the merge of csync mirall	2014-01-15 12:20:03 +01:00
Olivier Goffart	bf7ca60bec	Move csync in order to merge it with mirall	2014-01-13 14:39:50 +01:00