summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES6
-rw-r--r--pygments/__init__.py2
-rwxr-xr-xsetup.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/CHANGES b/CHANGES
index 2cb8396d..56778f8e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,7 +6,7 @@ http://bitbucket.org/birkenfeld/pygments-main/issues.
Version 1.5
-----------
-(codename not decided, released 2012)
+(codename Zeitdilatation, released Mar 10, 2012)
- Lexers added:
@@ -351,7 +351,7 @@ Version 1.0
- Added Tango style, written by Andre Roberge for the Crunchy project.
-- Added Python3TracebackLexer and ``python3`` option to
+- Added Python3TracebackLexer and ``python3`` option to
PythonConsoleLexer.
- Fixed a few bugs in the Haskell lexer.
@@ -689,7 +689,7 @@ Version 0.7
- Added token stream filters, and a pygmentize option to use them.
-- Changed behavior of `in` Operator for tokens.
+- Changed behavior of `in` Operator for tokens.
- Added mimetypes for all lexers.
diff --git a/pygments/__init__.py b/pygments/__init__.py
index 8a0e337e..0ecc167d 100644
--- a/pygments/__init__.py
+++ b/pygments/__init__.py
@@ -26,7 +26,7 @@
:license: BSD, see LICENSE for details.
"""
-__version__ = '1.4'
+__version__ = '1.5'
__docformat__ = 'restructuredtext'
__all__ = ['lex', 'format', 'highlight']
diff --git a/setup.py b/setup.py
index 3297e471..caee9a80 100755
--- a/setup.py
+++ b/setup.py
@@ -60,7 +60,7 @@ else:
setup(
name = 'Pygments',
- version = '1.4',
+ version = '1.5',
url = 'http://pygments.org/',
license = 'BSD License',
author = 'Georg Brandl',