# HG changeset patch
# User Georg Brandl <georg@python.org>
# Date 1262373488 -3600
#      Fri Jan 01 20:18:08 2010 +0100
# Branch trunk
# Node ID bae0833cae75e5a641abe3c4b430fa384cd9d258
# Parent  a82ff40953d5af163ee133e995eeb803be5435ec
Update version info/changelog and update requirement info.

diff --git a/CHANGES b/CHANGES
--- a/CHANGES
+++ b/CHANGES
@@ -5,7 +5,7 @@
 
 Version 1.2
 -----------
-(codename not selected)
+(codename Neujahr, released Jan 01, 2010)
 
 - Dropped Python 2.3 compatibility.
 
@@ -42,8 +42,6 @@
 
 - A few ASM lexer fixes (#450).
 
-- Added new float ops to LLVM.
-
 
 Version 1.1.1
 -------------
diff --git a/docs/src/installation.txt b/docs/src/installation.txt
--- a/docs/src/installation.txt
+++ b/docs/src/installation.txt
@@ -4,8 +4,8 @@
 Installation
 ============
 
-Pygments requires at least Python 2.3 to work correctly. Just to clarify:
-there *won't* ever be support for Python versions below 2.3. However, there
+Pygments requires at least Python 2.4 to work correctly. Just to clarify:
+there *won't* ever be support for Python versions below 2.4. However, there
 are no other dependencies.
 
 
diff --git a/pygments/__init__.py b/pygments/__init__.py
--- a/pygments/__init__.py
+++ b/pygments/__init__.py
@@ -25,7 +25,7 @@
     :license: BSD, see LICENSE for details.
 """
 
-__version__ = '1.1.1'
+__version__ = '1.2'
 __docformat__ = 'restructuredtext'
 
 __all__ = ['lex', 'format', 'highlight']
diff --git a/setup.py b/setup.py
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@
 
 setup(
     name = 'Pygments',
-    version = '1.1.1',
+    version = '1.2',
     url = 'http://pygments.org/',
     license = 'BSD License',
     author = 'Georg Brandl',