index
:
chromium_src.git
ignore/bar
ignore/foo
infra/config
lkcr
lkgr
master
replicant-6.0
central chromium sources
summary
refs
log
tree
commit
diff
stats
log msg
author
committer
range
path:
root
/
sync
/
engine
/
conflict_resolver.cc
Commit message (
Expand
)
Author
Age
Files
Lines
*
sync: Merge apply updates and resolve conflicts
rlarocque@chromium.org
2012-10-26
1
-29
/
+17
*
sync: wrap conflict_utils in a namespace
tim@chromium.org
2012-10-25
1
-5
/
+5
*
[Sync] Fix undelete conflict resolution
zea@chromium.org
2012-10-23
1
-29
/
+9
*
sync: Don't use ConflictProgress in the resolver
rlarocque@chromium.org
2012-10-02
1
-21
/
+9
*
sync: Introduce control data types
rlarocque@chromium.org
2012-08-31
1
-85
/
+15
*
[Sync] Refactor GetEncryptedTypes usage.
zea@chromium.org
2012-08-24
1
-1
/
+4
*
[Sync] Add SyncEncryptionHandler
zea@chromium.org
2012-08-16
1
-1
/
+1
*
[Sync] Remove unneeded 'using syncer::' lines and 'syncer::' scopings
akalin@chromium.org
2012-07-20
1
-1
/
+1
*
[Sync] Move ModelType and related classes to 'syncer' namespace
akalin@chromium.org
2012-07-03
1
-3
/
+1
*
[Sync] Move sync/{internal_api,syncable} into syncer namespace
akalin@chromium.org
2012-07-02
1
-5
/
+5
*
[Sync] Move nigori_util* to sync/syncable
akalin@chromium.org
2012-06-29
1
-1
/
+1
*
[Sync] Rename csync namespace to syncer
akalin@chromium.org
2012-06-28
1
-2
/
+2
*
[Sync] Rename browser_sync to csync in sync/
akalin@chromium.org
2012-06-21
1
-2
/
+2
*
Split syncable.{h,cc} into several files
rlarocque@chromium.org
2012-06-20
1
-1
/
+3
*
[Sync] Cleanup all tab sync enabling logic now that its on by default.
zea@chromium.org
2012-05-30
1
-6
/
+0
*
[Sync] Replace TalkMediator*/MediatorThread* with PushClient
akalin@chromium.org
2012-05-17
1
-1
/
+0
*
Fix some grammar in comments, error messages and documentation.
gavinp@chromium.org
2012-04-03
1
-3
/
+3
*
[Sync] Improve nigori conflict and rollback handling.
zea@chromium.org
2012-03-23
1
-5
/
+26
*
Separate SetPassphrase into encryption and decryption APIs
rsimha@chromium.org
2012-03-20
1
-3
/
+3
*
[Sync] Move 'sync' target to sync/
akalin@chromium.org
2012-03-15
1
-0
/
+404