summaryrefslogtreecommitdiffstats
path: root/sync/engine/conflict_resolver.h
Commit message (Expand)AuthorAgeFilesLines
* sync: Populate debug counters for directory typesrlarocque@chromium.org2014-05-151-2/+5
* sync: Merge apply updates and resolve conflictsrlarocque@chromium.org2012-10-261-7/+2
* sync: Don't use ConflictProgress in the resolverrlarocque@chromium.org2012-10-021-11/+1
* sync: Introduce control data typesrlarocque@chromium.org2012-08-311-4/+0
* Remove #pragma once from syncajwong@chromium.org2012-07-111-1/+0
* [Sync] Move sync/{internal_api,syncable} into syncer namespaceakalin@chromium.org2012-07-021-2/+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
* [Sync] Move 'sync' target to sync/akalin@chromium.org2012-03-151-0/+89