summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authormseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-10 05:54:52 +0000
committermseaborn@chromium.org <mseaborn@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-10 05:54:52 +0000
commitffbff785110c1f573be95ba17548ef865efad364 (patch)
tree72cf91abd3fc8f00528f979dd8a51503e32166f1 /DEPS
parent79046fd7bd8a97155e4082372ae90b13bb795358 (diff)
downloadchromium_src-ffbff785110c1f573be95ba17548ef865efad364.zip
chromium_src-ffbff785110c1f573be95ba17548ef865efad364.tar.gz
chromium_src-ffbff785110c1f573be95ba17548ef865efad364.tar.bz2
NaCl: Update revision in DEPS, r6668 -> r6677
This pulls in the following Native Client changes: r6669: (bsy) Change Windows implementation of clock to be XSI conformant. r6670: (pdox) Add hg username to merge-tool script. r6671: (pdox) Update UPSTREAM_REV to bring in: r6672: (pdox) Add HG_CONFIG to hg commit line in merge-tool.sh r6673: (pdox) Have the PNaCl / LLVM merge bot use tip of tree LLVM if BUILDBOT_REVISION is blank. r6674: (kschimpf) Update the command-line validator ncval to generate detailed error messages r6675: (mcgrathr) Remove obsolete and disabled tests for glibc IMC startup hack r6676: (ncbray) Make command_tester.py's output look more like gtest's. r6677: (jasonwkim) Add enum NaClSBKind argument to trusted code for selecting validator kind. BUG=none TEST=nacl_integration Review URL: http://codereview.chromium.org/7796023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100574 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'DEPS')
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 32038bd..6fc76eb 100644
--- a/DEPS
+++ b/DEPS
@@ -7,7 +7,7 @@ vars = {
"webkit_revision": "94856",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
- "nacl_revision": "6668",
+ "nacl_revision": "6677",
# After changing nacl_revision, run 'glient sync' and check native_client/DEPS
# to update other nacl_*_revision's.
# TODO(brettw) We should use the "From" syntax to avoid hardcoding the