summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/sync_setup_wizard.h
Commit message (Collapse)AuthorAgeFilesLines
* Merge Chromium.org at r11.0.672.0: Initial merge by git.Kristian Monsen2011-06-141-1/+1
| | | | Change-Id: I8b4aaf611a2a405fe3fe10e8a94ea7658645c192
* Merge Chromium at r10.0.634.0: Initial merge by git.Kristian Monsen2011-05-251-2/+3
| | | | Change-Id: Iac2af492818d119bcc2562eb5fdabf5ab0b6df9c
* Merge Chromium at r63472 : Initial merge by git.Iain Merrick2010-11-031-9/+12
| | | | Change-Id: Ifb9ee821af006a5f2211e81471be93ae440a1f5a
* Merge Chromium at 7.0.540.0 : Initial merge by gitIain Merrick2010-10-191-0/+1
| | | | | | Not including third_party/icu as it contains huge data files that break Gerrit, and aren't actually used. Change-Id: I428a386e70f3b58cacd28677b8cfda282e891e15
* Merge Chromium src@r53293Ben Murdoch2010-08-041-0/+88
Change-Id: Ia79acf8670f385cee48c45b0a75371d8e950af34