summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/resources/merge_and_sync.html
Commit message (Expand)AuthorAgeFilesLines
* Fix line endings on merge_and_sync.html in repo, it is breaking svn.tim@chromium.org2009-10-141-2/+2
* Fix merge and sync alignment issue.nick@chromium.org2009-10-081-4/+6
* sync i18n support for gaia_login.html and merge_and_sync.htmlMove resources i...tim@chromium.org2009-09-281-19/+11
* Handle some startup errors encountered by ModelAssociator (such as tim@chromium.org2009-09-161-0/+8
* Use jstemplates in merge and sync setup page.tim@chromium.org2009-09-141-11/+21
* Add files to browser/sync and tweak includes.tim@chromium.org2009-08-051-0/+66
* Rolling back 22317bradnelson@google.com2009-08-031-66/+0
* Add the image resources first so the CL that references them can pass ontim@chromium.org2009-08-031-0/+66