summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-03 22:10:18 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-03 22:10:18 +0000
commitb11e2282df595dc1be8eff048bc3c1ea98fce172 (patch)
treeb6dbc1673757cd8c36e084ad574904a4e4460be1
parent1c1651f3a1f452354078aae4d3cc52528016de6c (diff)
downloadchromium_src-b11e2282df595dc1be8eff048bc3c1ea98fce172.zip
chromium_src-b11e2282df595dc1be8eff048bc3c1ea98fce172.tar.gz
chromium_src-b11e2282df595dc1be8eff048bc3c1ea98fce172.tar.bz2
Merge 102932 - Roll libjpeg_turbo r97297->r102926
BUG=87704 TBR=agl@chromium.org Review URL: http://codereview.chromium.org/8115011 git-svn-id: svn://svn.chromium.org/chrome/branches/874/src@103798 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
1 files changed, 1 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index de94cc8..d52b773 100644
--- a/DEPS
+++ b/DEPS
@@ -251,7 +251,7 @@ deps = {
"/trunk/deps/third_party/yasm/patched-yasm@73761",
"src/third_party/libjpeg_turbo":
- "/trunk/deps/third_party/libjpeg_turbo@95800",
+ "/trunk/deps/third_party/libjpeg_turbo@102926",
"src/third_party/flac":
"/trunk/deps/third_party/flac@96404",