summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/engine/conflict_resolver.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
* Multi-pass ModelChangingSyncerCommands.tim@chromium.org2010-02-251-9/+9
* sync: Fix license copyright text.evan@chromium.org2009-12-111-1/+1
* sync: get rid of path_helpers files.nick@chromium.org2009-11-251-1/+0
* Add browser_sync 'sessions' to relieve SyncCycleState, SyncProcessState, Sync...tim@chromium.org2009-11-211-22/+24
* Remove unique naming from syncer! This reduces the complexity. Modify the ind...chron@google.com2009-11-201-258/+18
* A large number of style nits in preparation for turning on automated cpplint.py.erg@google.com2009-11-111-4/+4
* Removes blocked items. Also, some minor cleanup in preparation for (and to he...tim@chromium.org2009-11-101-6/+0
* Remove context-based dependencies on SyncerSession from ApplyUpdatesCommand.tim@chromium.org2009-11-031-1/+1
* linux: fix gcc 4.3 issues (for arm)piman@chromium.org2009-10-271-1/+2
* Hook up "remaining changes" to sync client. Remove "latest timestamp".chron@chromium.org2009-10-231-2/+4
* Fix compiling of sync on linux.zork@chromium.org2009-09-221-6/+6
* Review URL: http://codereview.chromium.org/201087idana@chromium.org2009-09-111-35/+29
* Initial commit of sync engine code to browser/sync.nick@chromium.org2009-09-101-0/+758