summaryrefslogtreecommitdiffstats
path: root/meta/files/common-licenses/Xnet
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/Xnet
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/Xnet')
-rw-r--r--meta/files/common-licenses/Xnet11
1 files changed, 2 insertions, 9 deletions
diff --git a/meta/files/common-licenses/Xnet b/meta/files/common-licenses/Xnet
index 0aa2e03195..0444edf2ca 100644
--- a/meta/files/common-licenses/Xnet
+++ b/meta/files/common-licenses/Xnet
@@ -5,8 +5,7 @@ This License has been voluntarily deprecated by its author.
5Copyright (c) 2000-2001 X.Net, Inc. Lafayette, California, USA 5Copyright (c) 2000-2001 X.Net, Inc. Lafayette, California, USA
6 6
7Permission is hereby granted, free of charge, to any person obtaining a copy 7Permission is hereby granted, free of charge, to any person obtaining a copy
8of this software and associated documentation files (the "Software"), 8of this software and associated documentation files (the "Software"), to deal
9to deal
10in the Software without restriction, including without limitation the rights 9in the Software without restriction, including without limitation the rights
11to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 10to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
12copies of the Software, and to permit persons to whom the Software is 11copies of the Software, and to permit persons to whom the Software is
@@ -15,8 +14,7 @@ furnished to do so, subject to the following conditions:
15The above copyright notice and this permission notice shall be included in 14The above copyright notice and this permission notice shall be included in
16all copies or substantial portions of the Software. 15all copies or substantial portions of the Software.
17 16
18THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 17THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
19EXPRESS OR
20IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 18IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
21FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 19FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
22AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 20AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
@@ -27,8 +25,3 @@ THE SOFTWARE.
27This agreement shall be governed in all respects by the laws of the State of 25This agreement shall be governed in all respects by the laws of the State of
28California and by the laws of the United States of America. 26California and by the laws of the United States of America.
29 27
30
31
32
33
34