summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/engine/conflict_resolver.h
Commit message (Expand)AuthorAgeFilesLines
* build fix: missing includeevan@chromium.org2009-11-221-0/+1
* Add browser_sync 'sessions' to relieve SyncCycleState, SyncProcessState, Sync...tim@chromium.org2009-11-211-14/+9
* Remove unique naming from syncer! This reduces the complexity. Modify the ind...chron@google.com2009-11-201-28/+0
* Fixes almost all of the rest of lint errors in the chrome/ directory (minus t...erg@google.com2009-11-131-1/+1
* Review URL: http://codereview.chromium.org/201087idana@chromium.org2009-09-111-5/+5
* Initial commit of sync engine code to browser/sync.nick@chromium.org2009-09-101-0/+129