summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-31 16:48:20 +0000
committerjshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-03-31 16:48:20 +0000
commit938246ea54d41dc84d22541815e60fa11242e4c7 (patch)
treea2702ec63a31309d3e4dcba472d32bee19a8e466
parentb32c34d94c4003553cef023b47014d6cab96ac8e (diff)
downloadchromium_src-938246ea54d41dc84d22541815e60fa11242e4c7.zip
chromium_src-938246ea54d41dc84d22541815e60fa11242e4c7.tar.gz
chromium_src-938246ea54d41dc84d22541815e60fa11242e4c7.tar.bz2
Pull in ICU@43139 and remove icudt42.dll from the exception list in checkbins.py
(see http://codereview.chromium.org/1523002 ) BUG=39303 TEST=checkbins.py doesn't complain about third_party/icu/icudt42.dll Review URL: http://codereview.chromium.org/1528011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43226 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rwxr-xr-xtools/checkbins/checkbins.py1
2 files changed, 1 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index eef3962..f99ef3a 100644
--- a/DEPS
+++ b/DEPS
@@ -29,7 +29,7 @@ deps = {
"/trunk/deps/third_party/WebKit@33467",
"src/third_party/icu":
- "/trunk/deps/third_party/icu42@42963",
+ "/trunk/deps/third_party/icu42@43139",
"src/third_party/hunspell":
"/trunk/deps/third_party/hunspell128@41000",
diff --git a/tools/checkbins/checkbins.py b/tools/checkbins/checkbins.py
index 362e43e..f16fce2 100755
--- a/tools/checkbins/checkbins.py
+++ b/tools/checkbins/checkbins.py
@@ -27,7 +27,6 @@ NXCOMPAT_FLAG = 0x0100
# require /NXCOMPAT and /DYNAMICBASE. Contact cpu@chromium.org or your local
# Windows guru for advice.
EXCLUDED_FILES = ['chrome_frame_mini_installer.exe',
- 'icudt42.dll',
'mini_installer.exe',
'wow_helper.exe']