summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-06-28 16:59:47 -0700
committerH. Peter Anvin <hpa@zytor.com>2009-06-28 16:59:47 -0700
commitccaf22e4b12f588e609231a9f4450df16fac9677 (patch)
tree829fefbff9f27914634e43703e8640f07eb7d686 /LICENSE
parent6373d98cf47d580f54491e605c3be037f577be2e (diff)
downloadnasm-ccaf22e4b12f588e609231a9f4450df16fac9677.tar.gz
nasm-ccaf22e4b12f588e609231a9f4450df16fac9677.tar.bz2
nasm-ccaf22e4b12f588e609231a9f4450df16fac9677.zip
LICENSE: include the actual BSD license
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE33
1 files changed, 31 insertions, 2 deletions
diff --git a/LICENSE b/LICENSE
index a9128b3..0dd16f6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,10 +1,39 @@
Most of NASM is licensed under the GNU Lesser General Public License
(LGPL) version 2.1 or, at your option, any later version.
+Please read the "COPYING" file in the archive root, or visit
+http://www.gnu.org/licenses/lgpl.html, for information about the LGPL.
+
We are trying to shift the license to the 2-clause BSD license, so any
patches submitted are required to be dual-licensed under those two licenses.
Many files are already switched to the 2-clause BSD license.
-Please read the "COPYING" file in the archive root, or visit
-http://www.gnu.org/licenses/lgpl.html, for information about the LGPL.
+The 2-clause BSD license is:
+
+ Copyright 1996-2009 the NASM Authors - All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following
+ conditions are met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the following
+ disclaimer in the documentation and/or other materials provided
+ with the distribution.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+ EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.