summaryrefslogtreecommitdiffstats
path: root/sync/engine/conflict_resolver.cc
Commit message (Expand)AuthorAgeFilesLines
* sync: Merge apply updates and resolve conflictsrlarocque@chromium.org2012-10-261-29/+17
* sync: wrap conflict_utils in a namespacetim@chromium.org2012-10-251-5/+5
* [Sync] Fix undelete conflict resolutionzea@chromium.org2012-10-231-29/+9
* sync: Don't use ConflictProgress in the resolverrlarocque@chromium.org2012-10-021-21/+9
* sync: Introduce control data typesrlarocque@chromium.org2012-08-311-85/+15
* [Sync] Refactor GetEncryptedTypes usage.zea@chromium.org2012-08-241-1/+4
* [Sync] Add SyncEncryptionHandlerzea@chromium.org2012-08-161-1/+1
* [Sync] Remove unneeded 'using syncer::' lines and 'syncer::' scopingsakalin@chromium.org2012-07-201-1/+1
* [Sync] Move ModelType and related classes to 'syncer' namespaceakalin@chromium.org2012-07-031-3/+1
* [Sync] Move sync/{internal_api,syncable} into syncer namespaceakalin@chromium.org2012-07-021-5/+5
* [Sync] Move nigori_util* to sync/syncableakalin@chromium.org2012-06-291-1/+1
* [Sync] Rename csync namespace to syncerakalin@chromium.org2012-06-281-2/+2
* [Sync] Rename browser_sync to csync in sync/akalin@chromium.org2012-06-211-2/+2
* Split syncable.{h,cc} into several filesrlarocque@chromium.org2012-06-201-1/+3
* [Sync] Cleanup all tab sync enabling logic now that its on by default.zea@chromium.org2012-05-301-6/+0
* [Sync] Replace TalkMediator*/MediatorThread* with PushClientakalin@chromium.org2012-05-171-1/+0
* Fix some grammar in comments, error messages and documentation.gavinp@chromium.org2012-04-031-3/+3
* [Sync] Improve nigori conflict and rollback handling.zea@chromium.org2012-03-231-5/+26
* Separate SetPassphrase into encryption and decryption APIsrsimha@chromium.org2012-03-201-3/+3
* [Sync] Move 'sync' target to sync/akalin@chromium.org2012-03-151-0/+404