Permalink
Browse files

Dual license GPL/MIT. Bump version to 0.4.5.

  • Loading branch information...
1 parent 8452e4e commit feaa8025aa06e8ac5b6d32936b57c2147381b672 @jgm jgm committed Jul 13, 2009
Showing with 34 additions and 11 deletions.
  1. +24 −1 LICENSE
  2. +2 −1 README.markdown
  3. +4 −5 markdown.c
  4. +2 −2 markdown_lib.c
  5. +2 −2 markdown_output.c
View
25 LICENSE
@@ -1,7 +1,10 @@
markdown in c, implemented using PEG grammar
Copyright (c) 2008 John MacFarlane
-Released under GPL:
+peg-markdown is released under both the GPL and MIT licenses.
+You may pick the license that best fits your needs.
+
+The GPL
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -17,6 +20,26 @@ You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+The MIT License
+
+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.
+
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
peg-0.1.4 (included for convenience - http://piumarta.com/software/peg/)
View
@@ -21,7 +21,8 @@ Both a library and a standalone program are provided.
peg-markdown is written and maintained by John MacFarlane (jgm on
github), with significant contributions by Ryan Tomayko (rtomayko).
-It is released under the GPL; see LICENSE for details.
+It is released under both the GPL and the MIT license; see LICENSE for
+details.
Installing
==========
View
@@ -4,8 +4,8 @@
(c) 2008 John MacFarlane (jgm at berkeley dot edu).
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License or the MIT
+ license. See LICENSE for details.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,9 +33,8 @@ static int extensions;
***********************************************************************/
-#define VERSION "0.4.4"
-#define COPYRIGHT "Copyright (c) 2008 John MacFarlane.\n" \
- "License GPLv2+: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n" \
+#define VERSION "0.4.5"
+#define COPYRIGHT "Copyright (c) 2008 John MacFarlane. License GPLv2+ or MIT.\n" \
"This is free software: you are free to change and redistribute it.\n" \
"There is NO WARRANTY, to the extent permitted by law."
View
@@ -4,8 +4,8 @@
(c) 2008 John MacFarlane (jgm at berkeley dot edu).
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License or the MIT
+ license. See LICENSE for details.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
View
@@ -5,8 +5,8 @@
(c) 2008 John MacFarlane (jgm at berkeley dot edu).
This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; version 2 of the License.
+ it under the terms of the GNU General Public License or the MIT
+ license. See LICENSE for details.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of

0 comments on commit feaa802

Please sign in to comment.