summaryrefslogtreecommitdiffstats
path: root/meta/files/common-licenses/NCSA
diff options
context:
space:
mode:
authorBeth Flanagan <elizabeth.flanagan@intel.com>2011-06-15 13:52:23 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-06-23 23:44:49 +0100
commit7cd2ac0e40d854bab9a32512018aff6172500c0e (patch)
tree99366a7b07db9f0b53bb9d411f0016f36982616d /meta/files/common-licenses/NCSA
parent879a7f819b7f38cda82d97489af433310aabfed1 (diff)
downloadpoky-7cd2ac0e40d854bab9a32512018aff6172500c0e.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. (From OE-Core rev: e47343d12ee571281238bbf5663b074c0e32049f) Signed-off-by: Beth Flanagan <elizabeth.flanagan@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/files/common-licenses/NCSA')
-rw-r--r--meta/files/common-licenses/NCSA16
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 @@
1 1
2University of Illinois/NCSA Open Source License 2University of Illinois/NCSA Open Source License
3Copyright (c) <Year> <Owner Organization Name> 3Copyright (c) <Year> <Owner Organization Name>
4All rights reserved. 4All rights reserved.
5 5
6Developed by: <Name of Development Group> 6Developed by: <Name of Development Group>
7<Name of Institution> 7 <Name of Institution>
8<URL for Development Group/Institution> 8 <URL for Development Group/Institution>
9Permission is hereby granted, free of charge, to any person obtaining a 9Permission is hereby granted, free of charge, to any person obtaining a
10copy of this software and associated documentation files (the 10copy of this software and associated documentation files (the
11"Software"), to deal with the Software without restriction, including 11"Software"), to deal with the Software without restriction, including
@@ -24,8 +24,7 @@ Neither the names of <Name of Development Group, Name of
24Institution>, nor the names of its contributors may be used to endorse 24Institution>, nor the names of its contributors may be used to endorse
25or promote products derived from this Software without specific prior 25or promote products derived from this Software without specific prior
26written permission. 26written permission.
27THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 27THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
28EXPRESS
29OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 28OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
30MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 29MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
31IN NO EVENT SHALL THE CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR 30IN 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,
33TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 32TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
34SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE. 33SOFTWARE OR THE USE OR OTHER DEALINGS WITH THE SOFTWARE.
35 34
36
37
38
39
40