summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES.txt7
-rw-r--r--docs/conf.py2
-rw-r--r--setup.py2
3 files changed, 7 insertions, 4 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index e6beb4700..11eeb9d29 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,5 +1,5 @@
-Next Release
-============
+1.2a11 (2010-01-05)
+===================
Bug Fixes
---------
@@ -14,6 +14,9 @@ Bug Fixes
Features
--------
+- Jython compatibility (at least when repoze.bfg.jinja2 is used as the
+ templating engine; Chameleon does not work under Jython).
+
- Show the derived abspath of template resource specifications in the
traceback when a renderer template cannot be found.
diff --git a/docs/conf.py b/docs/conf.py
index 935bd386d..bb78d758d 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -53,7 +53,7 @@ copyright = '2008-2010, Agendaless Consulting'
# other places throughout the built documents.
#
# The short X.Y version.
-version = '1.2a10'
+version = '1.2a11'
# The full version, including alpha/beta/rc tags.
release = version
diff --git a/setup.py b/setup.py
index 23a316266..1a408d93a 100644
--- a/setup.py
+++ b/setup.py
@@ -12,7 +12,7 @@
#
##############################################################################
-__version__ = '1.2a10'
+__version__ = '1.2a11'
import os
import sys