diff options
| author | R. Tyler Ballance <tyler@slide.com> | 2009-05-25 18:40:21 -0700 |
|---|---|---|
| committer | R. Tyler Ballance <tyler@slide.com> | 2009-05-25 18:40:21 -0700 |
| commit | 943a0340376bae264f42c9ee0316dcd976a6f457 (patch) | |
| tree | b2d6a7da688fc529d8771262e7de9e4d1056c0ab | |
| parent | 272d48a12bbeb62b15b5dfb9fab7358a38625e1a (diff) | |
| parent | fa593e26a737acfac0453825905ff991a2c70b85 (diff) | |
| download | python-cheetah-943a0340376bae264f42c9ee0316dcd976a6f457.tar.gz | |
Merge branch 'master' of git@github.com:rtyler/cheetah into next
Conflicts:
SetupConfig.py
Signed-off-by: R. Tyler Ballance <tyler@slide.com>
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | src/Version.py | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -1,5 +1,5 @@ -2.2.0 (not yet released) +2.2.0 (May 17th, 2009) - Switch all internal representations of template code to unicode objects instead of str() objects - Convert unicode compiled template to an utf8 char buffer when writing to a file (Jean-Baptiste Quenot <jbq@caraldi.com>) - 0000011: [Templates] Calling a function with arguments calls the function with None (rtyler) diff --git a/src/Version.py b/src/Version.py index 4df399f..016e267 100644 --- a/src/Version.py +++ b/src/Version.py @@ -1,5 +1,5 @@ -Version = '2.2.0rc3' -VersionTuple = (2, 2, 0,'candidate', 3) +Version = '2.2.0' +VersionTuple = (2, 2, 0,'final', 0) MinCompatibleVersion = '2.0rc6' MinCompatibleVersionTuple = (2,0,0,'candidate',6) |