summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-23 00:04:49 +0000
committerwtc@chromium.org <wtc@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-23 00:04:49 +0000
commitf0945b63c617e60cc6792d7ad0c4aa98fd72effc (patch)
treeaecc139d550727aa549222a7b532d5f90ed74f1b
parent9dae678d1d16e6f466201208a0cbb686c4bf5c62 (diff)
downloadchromium_src-f0945b63c617e60cc6792d7ad0c4aa98fd72effc.zip
chromium_src-f0945b63c617e60cc6792d7ad0c4aa98fd72effc.tar.gz
chromium_src-f0945b63c617e60cc6792d7ad0c4aa98fd72effc.tar.bz2
Update to nss@39612 to pick up NSS_3_12_6_RC1 and
NSPR_4_8_4_RTM. See the actual diffs at http://codereview.chromium.org/650104 R=agl BUG=none TEST=No build errors or test failures. Review URL: http://codereview.chromium.org/652053 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39675 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 3d30d99ef..4aecb7b 100644
--- a/DEPS
+++ b/DEPS
@@ -137,7 +137,7 @@ deps_os = {
# NSS, for SSLClientSocketNSS.
"src/third_party/nss":
- "/trunk/deps/third_party/nss@39095",
+ "/trunk/deps/third_party/nss@39612",
"src/third_party/swig/win":
"/trunk/deps/third_party/swig/win@" + Var("swig_revision"),