summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/engine/conflict_resolver.h
Commit message (Expand)AuthorAgeFilesLines
* [Sync] Move 'sync' target to sync/akalin@chromium.org2012-03-151-89/+0
* sync: Delete ScopedDirLookup and DirectoryManagerrlarocque@chromium.org2012-02-281-2/+1
* [Sync] Implement encryption-aware conflict resolution.zea@chromium.org2011-12-231-0/+13
* [Sync] Add nigori node conflict resolution.zea@chromium.org2011-12-211-2/+7
* Remove code related to counting conflictsrlarocque@chromium.org2011-12-191-26/+0
* [Sync] Made some sync session member functions constakalin@chromium.org2011-11-231-1/+5
* sync: add DEPS files to subdirstim@chromium.org2011-08-111-1/+0
* Detect & destroy dead conflictresolver paths.nick@chromium.org2011-05-201-6/+0
* [Sync] Support for non-blocking conflicts and encryption conflicts.zea@chromium.org2011-05-051-2/+4
* `#pragma once` for app, base, chrome, gfx, ipc, net, skia, viewsthakis@chromium.org2010-07-261-0/+1
* [GTTF] Use FRIEND_TEST_ALL_PREFIXES in chrome/browser/syncphajdan.jr@chromium.org2010-06-101-2/+3
* Move event_sys.h, event_sys-inl.h and event_sys_unittest.cc to chrome/common ...sanjeevr@chromium.org2010-04-261-1/+1
* svn prop fixes. Applied to all files not in third_party.pkasting@chromium.org2010-03-091-0/+0
* 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