From 79ea90be68675c0366173334b269f15f156e2dbf Mon Sep 17 00:00:00 2001 From: "glider@chromium.org" Date: Tue, 25 May 2010 13:47:12 +0000 Subject: 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 --- base/allocator/allocator.gyp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'base') 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', -- cgit v1.1