summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-28 01:17:04 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-08-28 01:17:04 +0000
commitfacefc587f0124781b9dd08f91ebe03019afb51e (patch)
tree50ae33ad39952a196e8c7f8a7206ca1a00a71d40 /DEPS
parent96adadb80bec17998246ab05b328a4b0a4f4ef96 (diff)
downloadchromium_src-facefc587f0124781b9dd08f91ebe03019afb51e.zip
chromium_src-facefc587f0124781b9dd08f91ebe03019afb51e.tar.gz
chromium_src-facefc587f0124781b9dd08f91ebe03019afb51e.tar.bz2
Update src/third_party/nss to r55588 (original review URL
http://codereview.chromium.org/3113004). Replace the workaround for bug 40663 by the real fix. R=agl BUG=40663 TEST=Run chrome.exe on Windows. Use SSL. Shut down Chrome. All chrome.exe processes should terminate. Review URL: http://codereview.chromium.org/3235004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57766 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS4
1 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 5933554..c07a58c 100644
--- a/DEPS
+++ b/DEPS
@@ -203,7 +203,7 @@ deps_os = {
# NSS, for SSLClientSocketNSS.
"src/third_party/nss":
- "/trunk/deps/third_party/nss@55513",
+ "/trunk/deps/third_party/nss@55588",
"src/third_party/swig/win":
"/trunk/deps/third_party/swig/win@" + Var("swig_revision"),
@@ -240,7 +240,7 @@ deps_os = {
# NSS, for SSLClientSocketNSS.
"src/third_party/nss":
- "/trunk/deps/third_party/nss@55513",
+ "/trunk/deps/third_party/nss@55588",
"src/chrome/installer/mac/third_party/xz/xz":
"/trunk/deps/third_party/xz@50504",