diff options
| author | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 11:56:25 +0000 |
|---|---|---|
| committer | steveblock@chromium.org <steveblock@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-26 11:56:25 +0000 |
| commit | 4af547270ddc0aa60e53f17ed09857e63742cb65 (patch) | |
| tree | bbeb3891e30363f647c25c5d4a116b13ae1a105d /third_party/yasm/README.chromium | |
| parent | 94bbdac2dcb4ab8a719e21fec1e255ad1cad59f0 (diff) | |
| download | chromium_src-4af547270ddc0aa60e53f17ed09857e63742cb65.zip chromium_src-4af547270ddc0aa60e53f17ed09857e63742cb65.tar.gz chromium_src-4af547270ddc0aa60e53f17ed09857e63742cb65.tar.bz2 | |
Fix third-party license information for a number of projects
This fixes 'licenses.py scan' for the projects relevant to the Android WebView
build.
BUG=138921
Review URL: https://chromiumcodereview.appspot.com/10796121
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/yasm/README.chromium')
| -rw-r--r-- | third_party/yasm/README.chromium | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/third_party/yasm/README.chromium b/third_party/yasm/README.chromium index 5bf178d..3630013 100644 --- a/third_party/yasm/README.chromium +++ b/third_party/yasm/README.chromium @@ -1,6 +1,10 @@ Name: yasm URL: http://www.tortall.net/projects/yasm/ Version: 1.1.0 +License: 2-clause or 3-clause BSD licensed, with the exception of bitvect, which is triple-licensed under the Artistic license, GPL, and LGPL +License File: source/patched-yasm/COPYING +Security Critical: no + With these patches merged: * https://github.com/yasm/yasm/commit/a2cbb10ee1b90b73647667ac849c74d65761d412 * https://github.com/yasm/yasm/commit/01ab853e68ef8aeded716d6f5b34895200f66a51 @@ -8,8 +12,6 @@ With these patches merged: * https://github.com/yasm/yasm/commit/2bd66514b6b100887c19d8598da38347b3cff40e * https://github.com/yasm/yasm/commit/ab19547382660d81e0b4a0232dccb38f44c52a36 -License File: source/patched-yasm/COPYING -Security Critical: no See also the yasm.gyp file for a description of the yasm build process. |