| Index: third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/six/LICENSE
|
| diff --git a/third_party/simplejson/LICENSE.txt b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/six/LICENSE
|
| similarity index 53%
|
| copy from third_party/simplejson/LICENSE.txt
|
| copy to third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/six/LICENSE
|
| index ad95f29c172aaf259fc3adb087b2d3dd021f10ad..d76e024263ce4ca0b3a2822e5709ec210fe4b530 100644
|
| --- a/third_party/simplejson/LICENSE.txt
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/six/LICENSE
|
| @@ -1,19 +1,18 @@
|
| -Copyright (c) 2006 Bob Ippolito
|
| +Copyright (c) 2010-2014 Benjamin Peterson
|
|
|
| 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:
|
| +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.
|
| +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.
|
|
|