| commit | 3a642b92dc35b93107080ff791353882d878c82e | [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 | 71c0645b4dab8ab6df78e3ab02285752c5bad2d1 | |
| parent | cc8194139c7113ce37899ea05f73f6bdaa888748 [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 git-svn-id: http://google-breakpad.googlecode.com/svn/branches/chrome_15@877 4c0a9323-5329-0410-9bdc-e9ce6186880e