summaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2009-10-24 19:34:31 +0000
committerfiddlosopher <fiddlosopher@788f1e2b-df1e-0410-8736-df70ead52e1b>2009-10-24 19:34:31 +0000
commit2d47831f9a8699dbfe39e7a9c147106bf7abfaf2 (patch)
tree0f54e83c7732bd5c4176edc62503f0d83d75d972 /COPYRIGHT
parent9ae05c1a067a5fba93a8a44bc0d52052e4f17f92 (diff)
Updated COPYRIGHT file.
git-svn-id: https://pandoc.googlecode.com/svn/trunk@1611 788f1e2b-df1e-0410-8736-df70ead52e1b
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT43
1 files changed, 13 insertions, 30 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 798a196c2..58d22b3c4 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -44,9 +44,16 @@ Copyright (C) 2008 Andrea Rossato
Released under the GPL.
----------------------------------------------------------------------
-ASCIIMathML.js
-Copyright 2005, Peter Jipsen, Chapman University
-<http://www1.chapman.edu/~jipsen/mathml/asciimath.html>
+Text/Pandoc/Biblio.hs
+Copyright (C) 2008 Andrea Rossato
+
+Released under the GPL.
+
+----------------------------------------------------------------------
+LaTeXMathML.js
+Adapted by Jeff Knisely and Douglas Woodall from
+ASCIIMathML.js v. 1.4.7
+Copyright (C) 2005 Peter Jipsen
Released under the GPL.
@@ -60,33 +67,9 @@ Released under an explicit Public Domain License
------------------------------------------------------------------------
Diff.hs in tests/
from the Diff package v 0.1.2 (Data.Algorithm.Diff)
-Copyright (c) Stering Clover 2008
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-2. 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.
-3. Neither the name of the author nor the names of his contributors
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 AUTHORS 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.
+Copyright (c) Sterling Clover 2008
+
+Released under 3 clause BSD license.
------------------------------------------------------------------------
windows/modpath.iss