summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--third_party/yasm/README.chromium1
2 files changed, 2 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index dc4cdf1..f34e2a5 100644
--- a/DEPS
+++ b/DEPS
@@ -278,7 +278,7 @@ deps = {
"/trunk/deps/third_party/speex@111570",
"src/third_party/yasm/source/patched-yasm":
- "/trunk/deps/third_party/yasm/patched-yasm@126079",
+ "/trunk/deps/third_party/yasm/patched-yasm@134825",
"src/third_party/libjpeg_turbo":
"/trunk/deps/third_party/libjpeg_turbo@126090",
diff --git a/third_party/yasm/README.chromium b/third_party/yasm/README.chromium
index 76e81f5..007ad8d 100644
--- a/third_party/yasm/README.chromium
+++ b/third_party/yasm/README.chromium
@@ -5,6 +5,7 @@ With these patches merged:
* https://github.com/yasm/yasm/commit/a2cbb10ee1b90b73647667ac849c74d65761d412
* https://github.com/yasm/yasm/commit/01ab853e68ef8aeded716d6f5b34895200f66a51
* https://github.com/yasm/yasm/commit/82fafa7b5619e702c8681c959ade0746498e3cbc
+* https://github.com/yasm/yasm/commit/2bd66514b6b100887c19d8598da38347b3cff40e
License File: source/patched-yasm/COPYING
Security Critical: no