summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-29 20:38:39 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-29 20:38:39 +0000
commit3f79148c29174d4891dee2c6ee22b01675ac3248 (patch)
treefef6845170dc1269422238e5d2a3003df338dd74 /DEPS
parent326d3b7eb07359b5a88619f84286e912d4c6e531 (diff)
downloadchromium_src-3f79148c29174d4891dee2c6ee22b01675ac3248.zip
chromium_src-3f79148c29174d4891dee2c6ee22b01675ac3248.tar.gz
chromium_src-3f79148c29174d4891dee2c6ee22b01675ac3248.tar.bz2
Update NSS to r79733 to pick up:
Make NSS for Chromium build properly for Mac x86_64. BUG=18323 TEST=My own 'ARCHS': ['x86_64'] build. Chromium now builds up through base_unittests for x86_64, and all base_unittests pass except for those tests also marked FAILS_ for x86. Review URL: http://codereview.chromium.org/6773020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79738 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 f1a3a4e..798e41b 100644
--- a/DEPS
+++ b/DEPS
@@ -251,7 +251,7 @@ deps_os = {
# NSS, for SSLClientSocketNSS.
"src/third_party/nss":
- "/trunk/deps/third_party/nss@61580",
+ "/trunk/deps/third_party/nss@79733",
"src/third_party/swig/win":
"/trunk/deps/third_party/swig/win@" + Var("swig_revision"),
@@ -286,7 +286,7 @@ deps_os = {
# NSS, for SSLClientSocketNSS.
"src/third_party/nss":
- "/trunk/deps/third_party/nss@61580",
+ "/trunk/deps/third_party/nss@79733",
"src/chrome/installer/mac/third_party/xz/xz":
"/trunk/deps/third_party/xz@50504",