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/json_minify | |
| 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/json_minify')
| -rw-r--r-- | third_party/json_minify/LICENSE | 22 | ||||
| -rw-r--r-- | third_party/json_minify/README.chromium | 2 |
2 files changed, 22 insertions, 2 deletions
diff --git a/third_party/json_minify/LICENSE b/third_party/json_minify/LICENSE new file mode 100644 index 0000000..9c067fd --- /dev/null +++ b/third_party/json_minify/LICENSE @@ -0,0 +1,22 @@ +Copyright (c) Kyle Simpson + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without +restriction, including without limitation the rights to use, +copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the +Software is furnished to do so, subject to the following +conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES +OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +OTHER DEALINGS IN THE SOFTWARE. diff --git a/third_party/json_minify/README.chromium b/third_party/json_minify/README.chromium index 019c326..ccd4122 100644 --- a/third_party/json_minify/README.chromium +++ b/third_party/json_minify/README.chromium @@ -3,8 +3,6 @@ URL: https://github.com/getify/JSON.minify and also https://github.com/kitcambridge/JSON.minify Version: 0.1 License: MIT License -License file: https://github.com/getify/JSON.minify/blob/master/README.txt -(README has license info) Security Critical: no Description: |