summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-06 20:07:28 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-06 20:07:28 +0000
commit5db01fc554effca31166803b59900c3c26f0832e (patch)
treebcb59aeea6cdc0f058af3f2b47c7d7279fedc425
parent4bfa6307e82c1ca820a61261ce273300228ae973 (diff)
downloadchromium_src-5db01fc554effca31166803b59900c3c26f0832e.zip
chromium_src-5db01fc554effca31166803b59900c3c26f0832e.tar.gz
chromium_src-5db01fc554effca31166803b59900c3c26f0832e.tar.bz2
Revert 125182 - NaCl: Update revision in DEPS, r7946 -> r7952
This pulls in the following Native Client changes: r7947: (sehr) Removes the -i option from the start up command line and replaces the argument r7948: (halyavin) Remove temporary change need for display manifest url in chrome://memory page. r7949: (kschimpf) Fix code so that x86-32 decoder doesn't abort on some illegal instructions. r7950: (kschimpf) Factor out xed decoder into separate tester instance. r7951: (jvoung) Fix bug from 7761. Have pnacl toolchain tester actually test sbtc for arm. r7952: (kschimpf) Remove the confusing concept of OpDest from the new decoder. BUG=none TEST=nacl_integration Review URL: https://chromiumcodereview.appspot.com/9595029 TBR=mseaborn@chromium.org Review URL: https://chromiumcodereview.appspot.com/9600055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125206 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index 3e7c0c4..9d80e1e 100644
--- a/DEPS
+++ b/DEPS
@@ -8,7 +8,7 @@ vars = {
"webkit_revision": "109784",
"chromium_git": "http://git.chromium.org/git",
"swig_revision": "69281",
- "nacl_revision": "7952",
+ "nacl_revision": "7946",
# After changing nacl_revision, run 'glient sync' and check native_client/DEPS
# to update other nacl_*_revision's.
"nacl_tools_revision": "7139", # native_client/DEPS: tools_rev