summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorGulliver <gulliver@fargonauten.de>2014-10-09 00:45:00 +0200
committerGulliver <gulliver@fargonauten.de>2014-10-09 00:45:00 +0200
commit7da937e2aea109e42b5ce9d6c9fe2e4e9ec877fc (patch)
tree975a69c0533623790733074a42fb3a9bb7577bd9 /LICENSE
parent1703abe7a21f5014ce00f04bd95d2aa4e1ba81c0 (diff)
parentc69bfce61eeec398be46eb914f6280fe471b293f (diff)
Merge branch 'master' into cmake-build
* master: (75 commits) Remove duplicate `footer` Correct capitalization of JavaScript Added link to commonmark.org on web page. Added cases from #51 to spec. Added test case from issue #147. Removed uthash license. We no longer use this library. Removed bstrlib license. We no longer use this library. Removed oldtests. Cleaned up entity section of spec. Adjusted tests for new js parser. stmd.js: Fixed entityToChar, adding fromCodePoint polyfill. Reset label_nest_level before parsing reference. Removed spurious 'and', reflowed. Removed spurious 'and', reflowed. Further emph fallback optimizations. Some jshint fixes. Use simpler algorithm. Revert "Use integers instead of strings for tags." Revert "Use numerical constants." Use numerical constants. ...
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE25
1 files changed, 25 insertions, 0 deletions
diff --git a/LICENSE b/LICENSE
index bb8c36f..988c4b4 100644
--- a/LICENSE
+++ b/LICENSE
@@ -28,3 +28,28 @@ 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.
+
+-----
+
+The polyfill for String.fromCodePoint included in stmd.js is
+Copyright Mathias Bynens <http://mathiasbynens.be/>
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy 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 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 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 LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+