summaryrefslogtreecommitdiff
path: root/external/moin-parser.py
diff options
context:
space:
mode:
authorTim Hatch <tim@timhatch.com>2014-04-23 16:48:10 -0400
committerTim Hatch <tim@timhatch.com>2014-04-23 16:48:10 -0400
commit690a2bdfa924f76fd374e25bd9772c2090cf6414 (patch)
tree576991298817f1055da24857df6982dc2bd37d5a /external/moin-parser.py
parent1d9f7f4f19c49a22ecd119f58580f9bc5ccd5080 (diff)
parentb69477dc22e228cde4c1d39bf11b292b88d95fe1 (diff)
downloadpygments-690a2bdfa924f76fd374e25bd9772c2090cf6414.tar.gz
Merged in lefticus/pygments-main (pull request #24)
Conflicts: pygments/lexers/_mapping.py pygments/lexers/agile.py
Diffstat (limited to 'external/moin-parser.py')
-rw-r--r--external/moin-parser.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/external/moin-parser.py b/external/moin-parser.py
index 6d55004f..41131185 100644
--- a/external/moin-parser.py
+++ b/external/moin-parser.py
@@ -31,7 +31,7 @@
If you do not want to do that and are willing to accept larger HTML
output, you can set the INLINESTYLES option below to True.
- :copyright: Copyright 2006-2010 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2014 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""