7 commits

Author	SHA1	Message	Date
Olivier Goffart	1cf956ec21	Discovery phase: clear the callbacks after use	2014-08-21 11:27:25 +02:00
Olivier Goffart	dc18366111	DiscoveryPhase: put in namespace Mirall	2014-08-18 14:45:48 +02:00
Olivier Goffart	936252765a	Merge branch 'master' into selective_sync ... Conflicts: src/mirall/syncengine.cpp src/mirall/syncengine.h	2014-08-18 14:44:43 +02:00
Olivier Goffart	c1831f4946	Selective sync: use a black list instead of a white list	2014-08-15 12:29:10 +02:00
Olivier Goffart	12459bf07e	selective sync: fix whitelist matching	2014-08-12 11:43:42 +02:00
Olivier Goffart	7e009667a2	Selective sync: ignore the files that are not in the selective sync white list	2014-08-11 18:42:24 +02:00
Olivier Goffart	1f1eb933d1	Move the update job in a new file named discoveryphase ... "Discovery" is a better name than "update"	2014-08-11 18:42:24 +02:00