summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-03 22:10:47 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-03 22:10:47 +0000
commitd92dca587b1206b7e2455b9d37a602daf77e4544 (patch)
tree9e348afb4519d8d45fe30a7f19088e4ecbf42770
parentb11e2282df595dc1be8eff048bc3c1ea98fce172 (diff)
downloadchromium_src-d92dca587b1206b7e2455b9d37a602daf77e4544.zip
chromium_src-d92dca587b1206b7e2455b9d37a602daf77e4544.tar.gz
chromium_src-d92dca587b1206b7e2455b9d37a602daf77e4544.tar.bz2
Merge 102941 - Roll seccomp sandbox r169->r170.
Picks up changes to make code PIC-clean on 32-bit Linux. BUG=87704 TBR=agl@chromium.org Review URL: http://codereview.chromium.org/8120011 git-svn-id: svn://svn.chromium.org/chrome/branches/874/src@103799 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index d52b773..f6d0200 100644
--- a/DEPS
+++ b/DEPS
@@ -51,7 +51,7 @@ deps = {
(Var("googlecode_url") % "google-url") + "/trunk@159",
"src/seccompsandbox":
- (Var("googlecode_url") % "seccompsandbox") + "/trunk@168",
+ (Var("googlecode_url") % "seccompsandbox") + "/trunk@170",
"src/sdch/open-vcdiff":
(Var("googlecode_url") % "open-vcdiff") + "/trunk@28",