diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 00:12:21 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 00:12:21 +0000 |
| commit | e0fd9258257db12565e0bb9089aa591dcba967bc (patch) | |
| tree | b1ebbf45825b0319ca93a3bfc6a1cd8580e0db66 /third_party/yasm | |
| parent | 4c79378cbfd96e7efbe2b36529408c49fccfdba7 (diff) | |
| download | chromium_src-e0fd9258257db12565e0bb9089aa591dcba967bc.zip chromium_src-e0fd9258257db12565e0bb9089aa591dcba967bc.tar.gz chromium_src-e0fd9258257db12565e0bb9089aa591dcba967bc.tar.bz2 | |
Revert 124294 - Revert 124283 - roll yasm 73761:124103
Only change:
http://crrev.com/124103 yasm: Merge a clang warning fix.
BUG=82628
TEST=none
TBR=ajwong
Review URL: http://codereview.chromium.org/9534001
TBR=thakis@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9549011
TBR=mattm@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9559010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124298 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/yasm')
| -rw-r--r-- | third_party/yasm/README.chromium | 4 | ||||
| -rw-r--r-- | third_party/yasm/yasm.gyp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/third_party/yasm/README.chromium b/third_party/yasm/README.chromium index ca73b58..64ba7ac 100644 --- a/third_party/yasm/README.chromium +++ b/third_party/yasm/README.chromium @@ -1,7 +1,11 @@ Name: yasm URL: http://www.tortall.net/projects/yasm/ Version: 1.1.0 +With these patches merged: +* https://github.com/yasm/yasm/commit/a2cbb10ee1b90b73647667ac849c74d65761d412 + License File: source/patched-yasm/COPYING +Security Critical: no See also the yasm.gyp file for a description of the yasm build process. diff --git a/third_party/yasm/yasm.gyp b/third_party/yasm/yasm.gyp index 0fe28db..d981b50 100644 --- a/third_party/yasm/yasm.gyp +++ b/third_party/yasm/yasm.gyp @@ -27,7 +27,7 @@ # be a rule. The problem is that the correct invocation cannot be inferred # purely from the file name, or extension. Nor is it obvious whether the # output should be processed as a source or not. Thus, we are left with a -# large amount of repetative code. +# large amount of repetitive code. { 'variables': { |