summaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT27
1 files changed, 14 insertions, 13 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 10e33ebaf..711b8f299 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
Pandoc
-Copyright (C) 2006-2017 John MacFarlane <jgm at berkeley dot edu>
+Copyright (C) 2006-2018 John MacFarlane <jgm at berkeley dot edu>
With the exceptions noted below, this code is released under the [GPL],
version 2 or later:
@@ -37,7 +37,7 @@ The modules in the `pandoc-types` repository (Text.Pandoc.Definition,
Text.Pandoc.Builder, Text.Pandoc.Generics, Text.Pandoc.JSON,
Text.Pandoc.Walk) are licensed under the BSD 3-clause license:
-Copyright (c) 2006-2017, John MacFarlane
+Copyright (c) 2006-2018, John MacFarlane
All rights reserved.
@@ -72,29 +72,29 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Pandoc's templates (in `data/templates`) are dual-licensed GPL (v2 or
higher, same as pandoc) and the BSD 3-clause license.
-Copyright (c) 2014--2017, John MacFarlane
+Copyright (c) 2014--2018, John MacFarlane
----------------------------------------------------------------------
src/Text/Pandoc/Writers/Muse.hs
-Copyright (C) 2017 Alexander Krotov
+Copyright (C) 2017-2018 Alexander Krotov
Released under the GNU General Public License version 2 or later.
----------------------------------------------------------------------
src/Text/Pandoc/Writers/Texinfo.hs
-Copyright (C) 2008-2017 John MacFarlane and Peter Wang
+Copyright (C) 2008-2018 John MacFarlane and Peter Wang
Released under the GNU General Public License version 2 or later.
----------------------------------------------------------------------
src/Text/Pandoc/Writers/OpenDocument.hs
-Copyright (C) 2008-2017 Andrea Rossato and John MacFarlane
+Copyright (C) 2008-2018 Andrea Rossato and John MacFarlane
Released under the GNU General Public License version 2 or later.
----------------------------------------------------------------------
src/Text/Pandoc/Writers/Org.hs
-Copyright (C) 2010-2017 Puneeth Chaganti, John MacFarlane, and
+Copyright (C) 2010-2018 Puneeth Chaganti, John MacFarlane, and
Albert Krewinkel
Released under the GNU General Public License version 2 or later.
@@ -108,20 +108,21 @@ Released under the GNU General Public License version 2 or later.
----------------------------------------------------------------------
src/Text/Pandoc/Readers/Docx.hs
src/Text/Pandoc/Readers/Docx/*
-Copyright (C) 2014-2017 Jesse Rosenthal
+Copyright (C) 2014-2018 Jesse Rosenthal
Released under the GNU General Public License version 2 or later.
----------------------------------------------------------------------
src/Text/Pandoc/Readers/Textile.hs
-Copyright (C) 2010-2017 Paul Rivier and John MacFarlane
+Copyright (C) 2010-2018 Paul Rivier and John MacFarlane
Released under the GNU General Public License version 2 or later.
----------------------------------------------------------------------
src/Text/Pandoc/Readers/Org.hs
-test/Tests/Readers/Org.hs
-Copyright (C) 2014-2017 Albert Krewinkel
+src/Text/Pandoc/Readers/Org/*
+test/Tests/Readers/Org/*
+Copyright (C) 2014-2018 Albert Krewinkel
Released under the GNU General Public License version 2 or later.
@@ -141,7 +142,7 @@ Released under the GNU General Public License version 2 or later.
------------------------------------------------------------------------
data/pandoc.lua
-Copyright (C) 2017 Albert Krewinkel
+Copyright (C) 2017-2018 Albert Krewinkel
Released under the GNU General Public License version 2 or later.
@@ -155,7 +156,7 @@ Released under the Do What the Fuck You Want To Public License.
------------------------------------------------------------------------
Pandoc embeds a lua interpreter (via hslua).
-Copyright © 1994–2015 Lua.org, PUC-Rio.
+Copyright © 1994–2017 Lua.org, PUC-Rio.
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the