diff options
| author |   Beth Flanagan <elizabeth.flanagan@intel.com> | 2011-06-15 13:52:23 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-23 23:44:29 +0100 |
| commit | e47343d12ee571281238bbf5663b074c0e32049f (patch) | |
| tree | aa434dae7245a5748f2158c212f654b90cb22e01 /meta/files/common-licenses/Zlib | |
| parent | 319610d5bf61108f2ecc538c7a5de5b7c85a6684 (diff) | |
| download | openembedded-core-contrib-e47343d12ee571281238bbf5663b074c0e32049f.tar.gz | |
common-licenses: Additions and corrections
I've added more licenses from SPDX and corrected the gcc license
so that it is a. parsable and b. accurate to the SPDX standard.
I've also done some cleanup of license text and gdb's LICENSE
field.
Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com>
Diffstat (limited to 'meta/files/common-licenses/Zlib')
| -rw-r--r-- | meta/files/common-licenses/Zlib | 34 |
1 files changed, 15 insertions, 19 deletions
diff --git a/meta/files/common-licenses/Zlib b/meta/files/common-licenses/Zlib index 5da23064e6..f8b3884943 100644 --- a/meta/files/common-licenses/Zlib +++ b/meta/files/common-licenses/Zlib @@ -2,24 +2,20 @@ zlib License -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any damages -arising from the use of this software. - -Permission is granted to anyone to use this software for any purpose, -including commercial applications, and to alter it and redistribute it -freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must not -claim that you wrote the original software. If you use this software -in a product, an acknowledgment in the product documentation would be -appreciated but is not required. -2. Altered source versions must be plainly marked as such, and must not be -misrepresented as being the original software. -3. This notice may not be removed or altered from any source distribution. - - - - + This software is provided `as-is`, without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. |