summaryrefslogtreecommitdiffstats
path: root/third_party/yasm
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-11 22:16:52 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-11 22:16:52 +0000
commitfbee101b6ae57193e55e07264106b706e598ea3e (patch)
treefc996b468f8a148abbe0bcead3a31da4aba221e6 /third_party/yasm
parentc4c052845d062c1ff7ce74e2b94922463039e632 (diff)
downloadchromium_src-fbee101b6ae57193e55e07264106b706e598ea3e.zip
chromium_src-fbee101b6ae57193e55e07264106b706e598ea3e.tar.gz
chromium_src-fbee101b6ae57193e55e07264106b706e598ea3e.tar.bz2
roll yasm 124750:126079
Shanges: r126065: Merge an upstream warning fix to print "warning: section flags ignored on section redeclaration" less often on mac. r126079: Change a "//" comment introduced in r126065 to "/**/" BUG=none TEST=none TBR=fischman Review URL: http://codereview.chromium.org/9665047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@126082 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/yasm')
-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 64ba7ac..e22ea78 100644
--- a/third_party/yasm/README.chromium
+++ b/third_party/yasm/README.chromium
@@ -3,6 +3,8 @@ URL: http://www.tortall.net/projects/yasm/
Version: 1.1.0
With these patches merged:
* https://github.com/yasm/yasm/commit/a2cbb10ee1b90b73647667ac849c74d65761d412
+* https://github.com/yasm/yasm/commit/01ab853e68ef8aeded716d6f5b34895200f66a51
+* https://github.com/yasm/yasm/pull/63
License File: source/patched-yasm/COPYING
Security Critical: no