diff options
| author | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 23:59:11 +0000 |
|---|---|---|
| committer | mattm@chromium.org <mattm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-29 23:59:11 +0000 |
| commit | a1dec3ccdc8ba5afea29941d60e786f3227ea3d6 (patch) | |
| tree | ef288c2e11eec26bc6c9e4b5bcd797dec86c6ac9 /third_party/yasm | |
| parent | fde7bbd7186d9c8be9603ea367ae45df4faaee0d (diff) | |
| download | chromium_src-a1dec3ccdc8ba5afea29941d60e786f3227ea3d6.zip chromium_src-a1dec3ccdc8ba5afea29941d60e786f3227ea3d6.tar.gz chromium_src-a1dec3ccdc8ba5afea29941d60e786f3227ea3d6.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124294 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, 1 insertions, 5 deletions
diff --git a/third_party/yasm/README.chromium b/third_party/yasm/README.chromium index 64ba7ac..ca73b58 100644 --- a/third_party/yasm/README.chromium +++ b/third_party/yasm/README.chromium @@ -1,11 +1,7 @@ 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 d981b50..0fe28db 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 repetitive code. +# large amount of repetative code. { 'variables': { |