diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-17 00:03:46 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-30 11:51:24 +0100 |
| commit | 72348d7342b67133b80566824ec56ee7afff127f (patch) | |
| tree | 8e3091bcc74ccc2c341e67c441bc1d9747baa46a /sdch/open-vcdiff/compile | |
| parent | 1677284a2f4414f9a4563d58bc955d6749c4cc2a (diff) | |
| download | external_chromium-72348d7342b67133b80566824ec56ee7afff127f.zip external_chromium-72348d7342b67133b80566824ec56ee7afff127f.tar.gz external_chromium-72348d7342b67133b80566824ec56ee7afff127f.tar.bz2 | |
Merge Chromium at r11.0.696.0: Fix conflicts in Autofill
Autofill renaming:
http://codereview.chromium.org/6626042
http://codereview.chromium.org/6625033
http://codereview.chromium.org/6621008
http://codereview.chromium.org/6602001
http://codereview.chromium.org/6591029
Change inside an #ifdef:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_download.cc?view=diff&pathrev=77261&r1=77212&r2=77213
Include moved:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_manager.h?r1=76330&r2=76512&pathrev=77261
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_manager.cc?view=diff&pathrev=77261&r1=76476&r2=76477
TabContents changed to function:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_manager.h?r1=74360&r2=75226&pathrev=77261
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/autofill_manager.cc?view=diff&pathrev=77261&r1=75225&r2=75226
Diffstat (limited to 'sdch/open-vcdiff/compile')
0 files changed, 0 insertions, 0 deletions