summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Ronacher <armin.ronacher@active-4.com>2008-11-23 15:45:13 +0100
committerArmin Ronacher <armin.ronacher@active-4.com>2008-11-23 15:45:13 +0100
commit5e58d43ae35f09b7cd7280311000d23e330e70c4 (patch)
tree25d77e1f6a8685b3db5a96e3fcaec5f526b44cb0
parent03e4e29612e53b3ed41d53bbc505fe1c8e48bd3c (diff)
downloadjinja2-5e58d43ae35f09b7cd7280311000d23e330e70c4.tar.gz
tip is now 2.2-dev
--HG-- branch : trunk
-rw-r--r--CHANGES6
-rw-r--r--setup.py2
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGES b/CHANGES
index bcf38d2..3870358 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
Jinja2 Changelog
-===============
+================
+
+Version 2.2
+-----------
+(codename to be selected, release date yet unknown)
Version 2.1
-----------
diff --git a/setup.py b/setup.py
index bc18c32..439ce9f 100644
--- a/setup.py
+++ b/setup.py
@@ -49,7 +49,7 @@ from distutils.errors import CCompilerError, DistutilsPlatformError
#: don't change the variable and assignment. the fabfile parses this
#: file to get the version for deployment from it.
-VERSION = '2.1'
+VERSION = '2.2'
data_files = []