summaryrefslogtreecommitdiffstats
path: root/third_party
diff options
context:
space:
mode:
authorscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-02 01:31:52 +0000
committerscottmg@chromium.org <scottmg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-02 01:31:52 +0000
commite1bf8882a1f569644249cfb61a5fe60b00e175d4 (patch)
treef7f9473dd2337aa8742e800159cf2007758ba425 /third_party
parent7acc214800c8b824ec6c704e7395143dbc702594 (diff)
downloadchromium_src-e1bf8882a1f569644249cfb61a5fe60b00e175d4.zip
chromium_src-e1bf8882a1f569644249cfb61a5fe60b00e175d4.tar.gz
chromium_src-e1bf8882a1f569644249cfb61a5fe60b00e175d4.tar.bz2
roll yasm to 134825
Merge https://github.com/yasm/yasm/commit/2bd66514b6b100887c19d8598da38347b3cff40e re2c: Use tmpfile instead of fixed temporary filename. TBR=thakis@chromium.org BUG=125646 Review URL: http://codereview.chromium.org/10284007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134849 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party')
-rw-r--r--third_party/yasm/README.chromium1
1 files changed, 1 insertions, 0 deletions
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