summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authormmortensen@google.com <mmortensen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-06 22:05:14 +0000
committermmortensen@google.com <mmortensen@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-06 22:05:14 +0000
commita9fe04d9a91c96ba81fba6bf236a8ac709dbdf8a (patch)
tree04d16d16050be37eeab47444e6afca9569750df4 /DEPS
parent68191897a022c7e689dc0ee1e0535c73999c2774 (diff)
downloadchromium_src-a9fe04d9a91c96ba81fba6bf236a8ac709dbdf8a.zip
chromium_src-a9fe04d9a91c96ba81fba6bf236a8ac709dbdf8a.tar.gz
chromium_src-a9fe04d9a91c96ba81fba6bf236a8ac709dbdf8a.tar.bz2
Update nacl in deps, remerge with DEPS changes a couple of times...
TEST=trybots,gclient sync BUG=none Review URL: http://codereview.chromium.org/6952006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS6
1 files changed, 3 insertions, 3 deletions
diff --git a/DEPS b/DEPS
index 8f615e5..01af170 100644
--- a/DEPS
+++ b/DEPS
@@ -8,9 +8,9 @@ vars = {
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
# These hashes need to be updated when nacl_revision is changed.
- "nacl_irt_hash_x86_32": "22aa515c504417708751f081f4b4325c0cebb1c7",
- "nacl_irt_hash_x86_64": "3f345b96ba52220f404140d73f75d5443818774a",
- "nacl_revision": "5062",
+ "nacl_irt_hash_x86_32": "e72ddc4bc568d6804dc595c8a136550ecaf6b5aa",
+ "nacl_irt_hash_x86_64": "694c864d7c50a902abf627771021abe658f519b3",
+ "nacl_revision": "5188",
"nacl_tools_revision": "5025",
"libjingle_revision": "55",
"libvpx_revision": "81610",