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/NCSA | |
| parent | 319610d5bf61108f2ecc538c7a5de5b7c85a6684 (diff) | |
| download | openembedded-core-e47343d12ee571281238bbf5663b074c0e32049f.tar.gz openembedded-core-e47343d12ee571281238bbf5663b074c0e32049f.tar.bz2 openembedded-core-e47343d12ee571281238bbf5663b074c0e32049f.zip | |
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/NCSA')
| -rw-r--r-- | meta/files/common-licenses/NCSA | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/meta/files/common-licenses/NCSA b/meta/files/common-licenses/NCSA index e0e694958d..d0ddc9b073 100644 --- a/meta/files/common-licenses/NCSA +++ b/meta/files/common-licenses/NCSA @@ -1,11 +1,11 @@ University of Illinois/NCSA Open Source License -Copyright (c) <Year> <Owner Organization Name> +Copyright (c) <Year> <Owner Organization Name> All rights reserved. -Developed by: <Name of Development Group> -<Name of Institution> -<URL for Development Group/Institution> +Developed by: <Name of Development Group> + <Name of Institution> + <URL for Development Group/Institution> Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal with the Software without restriction, including @@ -24,8 +24,7 @@ Neither the names of <Name of Development Group, Name of Institution>, nor the names of its contributors may be used to endorse or promote products derived from this Software without specific prior written permission. -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -EXPRESS +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 CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR @@ -33,8 +32,3 @@ 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 WITH THE SOFTWARE. - - - - - |