diff options
| author | Gulliver <gulliver@fargonauten.de> | 2014-10-09 00:45:00 +0200 |
|---|---|---|
| committer | Gulliver <gulliver@fargonauten.de> | 2014-10-09 00:45:00 +0200 |
| commit | 7da937e2aea109e42b5ce9d6c9fe2e4e9ec877fc (patch) | |
| tree | 975a69c0533623790733074a42fb3a9bb7577bd9 /license.uthash.txt | |
| parent | 1703abe7a21f5014ce00f04bd95d2aa4e1ba81c0 (diff) | |
| parent | c69bfce61eeec398be46eb914f6280fe471b293f (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.uthash.txt')
| -rw-r--r-- | license.uthash.txt | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/license.uthash.txt b/license.uthash.txt deleted file mode 100644 index ad8e16a..0000000 --- a/license.uthash.txt +++ /dev/null @@ -1,21 +0,0 @@ -Copyright (c) 2005-2013, Troy D. Hanson http://troydhanson.github.com/uthash/ -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. - -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. - |