diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-24 10:36:34 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-24 10:36:34 +0100 |
| commit | a3f7b4e666c476898878fa745f637129375cd889 (patch) | |
| tree | 1d78b48780e4c8603c226fd88d8f4b786f00bb81 /DEPS | |
| parent | d4336a7d5c149891bede0c3201c8e831520067af (diff) | |
| download | chromium_org-a3f7b4e666c476898878fa745f637129375cd889.tar.gz | |
Merge from Chromium at DEPS revision r213371
This commit was generated by merge_to_master.py.
Change-Id: I35a74205de4bff52a2dd6b15330f8a002a39efaf
Diffstat (limited to 'DEPS')
| -rw-r--r-- | DEPS | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -8,11 +8,11 @@ vars = { "sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s", "webkit_trunk": "http://src.chromium.org/blink/trunk", "nacl_trunk": "http://src.chromium.org/native_client/trunk", - "webkit_revision": "154672", + "webkit_revision": "154818", "chromium_git": "https://chromium.googlesource.com", "chromiumos_git": "https://chromium.googlesource.com/chromiumos", "swig_revision": "69281", - "nacl_revision": "11819", + "nacl_revision": "11830", # 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 @@ -29,11 +29,11 @@ vars = { "ffmpeg_hash": "245a8c0cdfdd5ab3da9045089661017e9ddd8d0e", "sfntly_revision": "134", - "skia_revision": "10169", + "skia_revision": "10239", # 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": "15795", + "v8_revision": "15825", # Three lines of non-changing comments so that # the commit queue can handle CLs rolling WebRTC # and V8 without interference from each other. @@ -71,13 +71,13 @@ deps = { "/external/angle.git@9b344317b2ced9123da6e0e55aeb75e8abca84c5", "src/third_party/trace-viewer": - (Var("googlecode_url") % "trace-viewer") + "/trunk@731", + (Var("googlecode_url") % "trace-viewer") + "/trunk@784", "src/third_party/WebKit": Var("webkit_trunk") + "@" + Var("webkit_revision"), "src/third_party/icu": - "/trunk/deps/third_party/icu46@212871", + "/trunk/deps/third_party/icu46@213354", "src/third_party/libexif/sources": "/trunk/deps/third_party/libexif/sources@146817", @@ -435,7 +435,7 @@ deps_os = { # For Linux and Chromium OS. "src/third_party/cros_system_api": Var("chromiumos_git") + "/platform/system_api.git" + - "@59a6e103fd972817e3bb69a65b91170ea40d877f", + "@295836580061cb441c11ee3b2a6c7225ecf9ebbb", # Note that this is different from Android's freetype repo. "src/third_party/freetype2/src": |