diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-25 13:47:12 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-25 13:47:12 +0000 |
| commit | 79ea90be68675c0366173334b269f15f156e2dbf (patch) | |
| tree | 56952974f22a58aec2ca30d1ac4abe0d3d3f8bf5 /base | |
| parent | 58a20f75ab7f1696586b3550c413f1ac1cbe23eb (diff) | |
| download | chromium_src-79ea90be68675c0366173334b269f15f156e2dbf.zip chromium_src-79ea90be68675c0366173334b269f15f156e2dbf.tar.gz chromium_src-79ea90be68675c0366173334b269f15f156e2dbf.tar.bz2 | |
Merge tcmalloc r93 into the Chromium tcmalloc branch.
We can't afford using r94 due to a performance regression.
TBR=willchan,antonm,jar,mbelshe
Review URL: http://codereview.chromium.org/2144003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48145 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/allocator/allocator.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/base/allocator/allocator.gyp b/base/allocator/allocator.gyp index d3ab4a9..a1ad04d 100644 --- a/base/allocator/allocator.gyp +++ b/base/allocator/allocator.gyp @@ -57,7 +57,7 @@ '<(tcmalloc_dir)/src/base/basictypes.h', '<(tcmalloc_dir)/src/base/commandlineflags.h', '<(tcmalloc_dir)/src/base/cycleclock.h', - # We don't list dynamic_annotations.cc since its copy is already + # We don't list dynamic_annotations.c since its copy is already # present in the dynamic_annotations target. '<(tcmalloc_dir)/src/base/dynamic_annotations.h', '<(tcmalloc_dir)/src/base/elfcore.h', |