summaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorAlbert Krewinkel <tarleb@moltkeplatz.de>2014-05-08 21:50:20 +0200
committerAlbert Krewinkel <tarleb@moltkeplatz.de>2014-05-09 00:46:08 +0200
commit8fdbef841d0ef77dcc2e30cfa475e92a0f3de6cf (patch)
treec0590078409945cb34ccc8334bdd60a235b242dd /COPYRIGHT
parent8afbd7e66499c4c9a24b225d3af01d353e0876ca (diff)
Update copyright notices for 2014, add missing notices
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT10
1 files changed, 5 insertions, 5 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index cd5adb1be..065090018 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,5 +1,5 @@
Pandoc
-Copyright (C) 2006-2013 John MacFarlane <jgm at berkeley dot edu>
+Copyright (C) 2006-2014 John MacFarlane <jgm at berkeley dot edu>
This code is released under the [GPL], version 2 or later:
@@ -33,25 +33,25 @@ licenses.
----------------------------------------------------------------------
src/Text/Pandoc/Writers/Texinfo.hs
-Copyright (C) 2008-2010 John MacFarlane and Peter Wang
+Copyright (C) 2008-2014 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-2010 Andrea Rossato and John MacFarlane
+Copyright (C) 2008-2014 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 Puneeth Chaganti
+Copyright (C) 2010-2014 Puneeth Chaganti and JohnMacFarlane
Released under the GNU General Public License version 2 or later.
----------------------------------------------------------------------
src/Text/Pandoc/Readers/Textile.hs
-Copyright (C) 2010 Paul Rivier
+Copyright (C) 2010-2014 Paul Rivier and John MacFarlane
Released under the GNU General Public License version 2 or later.