9 commits

Author	SHA1	Message	Date
Markus Goetz	3885d5d706	Discovery: Report root etag from engine to folder ... For #2352	2015-01-23 15:30:44 +01:00
Markus Goetz	0502f684e9	Discovery: Even less qDebug	2015-01-22 14:45:08 +01:00
Markus Goetz	dde8e35785	Discovery: Put results into proper place in map ... The map is for memory management. It can later be used as a cache for the recursive PROPFIND (if we decide to activate it again)	2015-01-22 14:25:24 +01:00
Olivier Goffart	5c2298fa37	Discovery phase: fix a few warnings	2015-01-20 18:50:03 +01:00
Markus Goetz	906779c4b1	SyncEngine: Use QNAM for csync_update ... This is for #2507	2015-01-20 18:27:25 +01:00
Daniel Molkentin	ae85aa33fd	Adjust namespaces	2014-11-09 22:34:07 +01:00
Daniel Molkentin	dc1e73dcb7	Merge remote-tracking branch 'origin/1.7' ... Conflicts: src/libsync/syncjournaldb.cpp test/CMakeLists.txt	2014-10-28 23:27:58 -04:00
Christian Kamm	7ae0338f5c	Merge remote-tracking branch 'origin/1.7' ... Conflicts: src/CMakeLists.txt src/cmd/cmd.cpp src/gui/socketapi.h src/libsync/syncengine.h test/CMakeLists.txt	2014-10-22 10:41:55 +02:00
Daniel Molkentin	e5471d8318	Build after merge	2014-08-26 14:33:21 +02:00

Renamed from src/mirall/discoveryphase.cpp (Browse further)