summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-02 18:51:33 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-02 18:51:33 +0000
commit0bbbe13596de43b0d3009dc627b4ca177cd1ce03 (patch)
tree1857041b748c4d200e896c398f155ce4eeddc0b6 /third_party
parent989af829ce8a4438915cc8a8e392d6d0f267e9d5 (diff)
downloadchromium_src-0bbbe13596de43b0d3009dc627b4ca177cd1ce03.zip
chromium_src-0bbbe13596de43b0d3009dc627b4ca177cd1ce03.tar.gz
chromium_src-0bbbe13596de43b0d3009dc627b4ca177cd1ce03.tar.bz2
roll yasm to 134927
- Merge https://github.com/yasm/yasm/commit/2bd66514b6b100887c19d8598da38347b3cff40e re2c: Use tmpfile instead of fixed temporary filename. - Merge https://github.com/yasm/yasm/commit/ab19547382660d81e0b4a0232dccb38f44c52a36 re2c: Work around tmpfile() issue on win32. TBR=thakis@chromium.org BUG=125646 Review URL: http://codereview.chromium.org/10329002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134957 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/yasm/README.chromium2
1 files changed, 2 insertions, 0 deletions
diff --git a/third_party/yasm/README.chromium b/third_party/yasm/README.chromium
index 76e81f5..4254310 100644
--- a/third_party/yasm/README.chromium
+++ b/third_party/yasm/README.chromium
@@ -5,6 +5,8 @@ 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
+* https://github.com/yasm/yasm/commit/ab19547382660d81e0b4a0232dccb38f44c52a36
License File: source/patched-yasm/COPYING
Security Critical: no