summaryrefslogtreecommitdiffstats
path: root/sync/engine/resolve_conflicts_command.cc
Commit message (Expand)AuthorAgeFilesLines
* sync: Merge apply updates and resolve conflictsrlarocque@chromium.org2012-10-261-42/+0
* sync: Remove ConflictProgressrlarocque@chromium.org2012-10-061-4/+4
* sync: Don't use ConflictProgress in the resolverrlarocque@chromium.org2012-10-021-1/+2
* [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/+2
* [Sync] Move 'sync' target to sync/akalin@chromium.org2012-03-151-0/+40