summaryrefslogtreecommitdiff
path: root/DEPS
diff options
context:
space:
mode:
authorBen Murdoch <benm@google.com>2013-07-31 11:42:55 +0100
committerBen Murdoch <benm@google.com>2013-07-31 11:42:55 +0100
commitfb250657ef40d7500f20882d5c9909c1013367d3 (patch)
treee7885d8f55b77d8ec4430fa4ec78add75c7270d8 /DEPS
parent8b098b9dd9d1242c3db3032622b35d8469d47ac4 (diff)
downloadchromium_org-fb250657ef40d7500f20882d5c9909c1013367d3.tar.gz
Merge from Chromium at DEPS revision r214456
This commit was generated by merge_to_master.py. Change-Id: If3f38c7966c2034e96c669968f72ea1e57f41964
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS8
1 files changed, 4 insertions, 4 deletions
diff --git a/DEPS b/DEPS
index 1149c75a98..7607d04569 100644
--- a/DEPS
+++ b/DEPS
@@ -12,7 +12,7 @@ vars = {
"chromium_git": "https://chromium.googlesource.com",
"chromiumos_git": "https://chromium.googlesource.com/chromiumos",
"swig_revision": "69281",
- "nacl_revision": "11830",
+ "nacl_revision": "11866",
# After changing nacl_revision, run 'glient sync' and check native_client/DEPS
# to update other nacl_*_revision's.
"nacl_tools_revision": "11437", # native_client/DEPS: tools_rev
@@ -33,7 +33,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling Skia
# and V8 without interference from each other.
- "v8_revision": "15899",
+ "v8_revision": "15955",
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling WebRTC
# and V8 without interference from each other.
@@ -68,7 +68,7 @@ deps = {
"src/third_party/angle_dx11":
Var("chromium_git") +
- "/external/angle.git@9b344317b2ced9123da6e0e55aeb75e8abca84c5",
+ "/external/angle.git@57a045443cebf1bb035bfa9cc63d392d875136ed",
"src/third_party/trace-viewer":
(Var("googlecode_url") % "trace-viewer") + "/trunk@784",
@@ -442,7 +442,7 @@ deps_os = {
# Build tools for targeting ChromeOS.
"src/third_party/chromite":
Var("chromiumos_git") + "/chromite.git" +
- "@93281fa6a9fa1af48aae02d0a9c142a4450af51e",
+ "@214fb6506eda13715edd74087adf367a29809a3c",
# Dependency of chromite.git.
"src/third_party/pyelftools":