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/Xnet | |
| 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/Xnet')
| -rw-r--r-- | meta/files/common-licenses/Xnet | 11 |
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. Copyright (c) 2000-2001 X.Net, Inc. Lafayette, California, USA Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), -to deal +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 @@ -15,8 +14,7 @@ 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 +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 @@ -27,8 +25,3 @@ THE SOFTWARE. This agreement shall be governed in all respects by the laws of the State of California and by the laws of the United States of America. - - - - - |