summaryrefslogtreecommitdiffstats
path: root/DEPS
diff options
context:
space:
mode:
authorhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-01 05:02:36 +0000
committerhbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-01 05:02:36 +0000
commitf598248e0b8c000acf755893f949cdc1165a8479 (patch)
tree5780bd1a7ca007eb4649ea80343cf89619e7a4b1 /DEPS
parente44a41953f9b1335d21ccc3aa992414f9fce07a8 (diff)
downloadchromium_src-f598248e0b8c000acf755893f949cdc1165a8479.zip
chromium_src-f598248e0b8c000acf755893f949cdc1165a8479.tar.gz
chromium_src-f598248e0b8c000acf755893f949cdc1165a8479.tar.bz2
Pull libjpeg-turbo r139754.
This change pulls your r139754 "Make the default to not use system lib for all builds" to the Chromium tree. TBR=davemoore BUG=none TEST=build Chrome OS. Review URL: https://chromiumcodereview.appspot.com/10458056 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139972 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 5bb2845..9a4ccdb 100644
--- a/DEPS
+++ b/DEPS
@@ -278,7 +278,7 @@ deps = {
"/trunk/deps/third_party/yasm/patched-yasm@134927",
"src/third_party/libjpeg_turbo":
- "/trunk/deps/third_party/libjpeg_turbo@139642",
+ "/trunk/deps/third_party/libjpeg_turbo@139754",
"src/third_party/flac":
"/trunk/deps/third_party/flac@120197",