aboutsummaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2015-04-26 10:18:29 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2015-04-26 10:18:29 -0700
commit1868cb5e42d81ddc319d6eb2aa3c423199a94800 (patch)
tree389be0f849147af544a14fd6123934fa17bb8aae /COPYRIGHT
parentfa76156d24d507151dec405dbe4a47c5ddd4efa6 (diff)
downloadpandoc-1868cb5e42d81ddc319d6eb2aa3c423199a94800.tar.gz
Updated copyright notices to -2015. Closes #2111.
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT12
1 files changed, 6 insertions, 6 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 4c2cff165..834bd5e84 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
Pandoc
-Copyright (C) 2006-2014 John MacFarlane <jgm at berkeley dot edu>
+Copyright (C) 2006-2015 John MacFarlane <jgm at berkeley dot edu>
This code is released under the [GPL], version 2 or later:
@@ -33,32 +33,32 @@ licenses.
----------------------------------------------------------------------
src/Text/Pandoc/Writers/Texinfo.hs
-Copyright (C) 2008-2014 John MacFarlane and Peter Wang
+Copyright (C) 2008-2015 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-2014 Andrea Rossato and John MacFarlane
+Copyright (C) 2008-2015 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-2014 Puneeth Chaganti and JohnMacFarlane
+Copyright (C) 2010-2015 Puneeth Chaganti and John MacFarlane
Released under the GNU General Public License version 2 or later.
----------------------------------------------------------------------
src/Text/Pandoc/Readers/Textile.hs
-Copyright (C) 2010-2014 Paul Rivier and John MacFarlane
+Copyright (C) 2010-2015 Paul Rivier and John MacFarlane
Released under the GNU General Public License version 2 or later.
----------------------------------------------------------------------
src/Text/Pandoc/Readers/Org.hs
tests/Tests/Readers/Org.hs
-Copyright (C) 2014 Albert Krewinkel
+Copyright (C) 2014-2015 Albert Krewinkel
Released under the GNU General Public License version 2 or later.