summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-17 03:07:29 +0000
committerbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-17 03:07:29 +0000
commit238de69ded467f09107d8fa77f92d2cc217c33ee (patch)
treece85b8c34aae5ff3498c2c2913f6a506eb30e02b
parente855683b7971d5c11cc88b68204560cd98103ea6 (diff)
downloadchromium_src-238de69ded467f09107d8fa77f92d2cc217c33ee.zip
chromium_src-238de69ded467f09107d8fa77f92d2cc217c33ee.tar.gz
chromium_src-238de69ded467f09107d8fa77f92d2cc217c33ee.tar.bz2
Pulling in multiple actions fix for windows (again).
BUG=gyp44 BUG=gyp32 TEST=None Review URL: http://codereview.chromium.org/6676057 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78512 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS4
1 files changed, 2 insertions, 2 deletions
diff --git a/DEPS b/DEPS
index 49ef4dc..5948094 100644
--- a/DEPS
+++ b/DEPS
@@ -7,7 +7,7 @@ vars = {
"webkit_revision": "81308",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
- "nacl_revision": "4508",
+ "nacl_revision": "4559",
"libjingle_revision": "55",
"libvpx_revision": "76510",
"ffmpeg_revision": "77796",
@@ -63,7 +63,7 @@ deps = {
(Var("googlecode_url") % "google-cache-invalidation-api") + "/trunk@70",
"src/tools/gyp":
- (Var("googlecode_url") % "gyp") + "/trunk@900",
+ (Var("googlecode_url") % "gyp") + "/trunk@901",
"src/v8":
(Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"),