| commit | 0e00d380e69d3f1795ef8799926ea71e264661e6 | [log] [tgz] |
|---|---|---|
| author | mark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | Thu Oct 20 21:38:01 2011 |
| committer | mark@chromium.org <mark@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | Thu Oct 20 21:38:01 2011 |
| tree | e37095971b722a4f1a1d4861628e2737ea8181dc | |
| parent | cbd11021c617456b9db9302ac3954764116c867d [diff] |
Merge trunk r875 to the chrome_15 branch. Fix some shadow variables, including one in file_id.cc that causes all files to generate the same hash. Add a test to make sure this doesn't happen again. Review URL: http://breakpad.appspot.com/316002 Original patch by Lei Zhang <thestig@chromium.org> Review URL: http://breakpad.appspot.com/320001 Cr-Mirrored-From: https://chromium.googlesource.com/breakpad/breakpad Cr-Mirrored-Commit: 3a642b92dc35b93107080ff791353882d878c82e