summaryrefslogtreecommitdiffstats
path: root/sync/engine/conflict_util.cc
Commit message (Expand)AuthorAgeFilesLines
* sync: Add getters and setters to Entry classesrlarocque@chromium.org2013-09-131-12/+12
* sync: wrap conflict_utils in a namespacetim@chromium.org2012-10-251-0/+3
* sync: Introduce control data typesrlarocque@chromium.org2012-08-311-0/+51