summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root>2007-11-06 01:24:30 +0000
committerroot <root>2007-11-06 01:24:30 +0000
commit06eac6f8c010d4bd41a19feca9db3ac13d3cafb3 (patch)
treef056375a2c23c23fb21affc77616ba2e51f544f5
parentbdffebc95dd4e027a45853749b06f140d6f97ebc (diff)
*** empty log message ***
-rw-r--r--LICENSE13
1 files changed, 9 insertions, 4 deletions
diff --git a/LICENSE b/LICENSE
index 21ef21a..e440058 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,6 +10,10 @@ met:
disclaimer in the documentation and/or other materials provided
with the distribution.
+ * The name of the author may not be used to endorse or promote
+ products derived from this software without specific prior written
+ permission.
+
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
@@ -22,8 +26,9 @@ 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.
-NOTE: some parts of this library are under a different license, namely the
-3-clause BSD style license, which is compatible with this one, but carries
-the additional restriction that you must not use the name of the author(s)
-of those parts to endorse any product.
+NOTE: the core parts of this library are under the so-called 2-clause
+BSD style license, which is compatible with this one, but lacks the
+restriction that you must not use the name of the author(s) of those parts
+to endorse any product. So feel free to use the authors name and any
+others that helped write the core parts :)