summaryrefslogtreecommitdiff
path: root/pygments/console.py
diff options
context:
space:
mode:
authorTim Hatch <tim@timhatch.com>2014-04-14 15:24:11 -0400
committerTim Hatch <tim@timhatch.com>2014-04-14 15:24:11 -0400
commit775708f0cd0fc79c120efff55becfc9c0d52aab3 (patch)
treea3b2610df30e95695abfb4ef8d5728861dbe90c3 /pygments/console.py
parent4ea98ad140a53922d83be5c1ab298e4ca2e980cc (diff)
parentdd4dc914d46c58843c5144aaad6f85bc78ed1973 (diff)
downloadpygments-775708f0cd0fc79c120efff55becfc9c0d52aab3.tar.gz
Merged in alexsdutton/pygments-main (pull request #78)
Conflicts: AUTHORS pygments/lexers/_mapping.py
Diffstat (limited to 'pygments/console.py')
-rw-r--r--pygments/console.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pygments/console.py b/pygments/console.py
index 3901bd18..d93f6a9f 100644
--- a/pygments/console.py
+++ b/pygments/console.py
@@ -5,7 +5,7 @@
Format colored console output.
- :copyright: Copyright 2006-2012 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2014 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""