summaryrefslogtreecommitdiff
path: root/CHANGES
diff options
context:
space:
mode:
authorR. Tyler Ballance <tyler@slide.com>2009-05-11 20:08:51 -0700
committerR. Tyler Ballance <tyler@slide.com>2009-05-11 20:08:51 -0700
commitaacd468ce22f8fd72dc29ebcf95756e332b5d718 (patch)
treec26a812b986c9a52a4a1794ca27259a40823cf8a /CHANGES
parent303e674245340e5a1d3dec62f6991644231d24c8 (diff)
parentf2c1e611289e12f5fdcb322ab12a51ac3b709437 (diff)
downloadpython-cheetah-aacd468ce22f8fd72dc29ebcf95756e332b5d718.tar.gz
Merge branch 'master' of git@github.com:rtyler/cheetah into next
Conflicts: CHANGES src/Tests/Template.py Signed-off-by: R. Tyler Ballance <tyler@slide.com>
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 494da2b..e5e767c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,9 @@
- 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>)
+2.1.2 (May 5, 2009)
+ - 0000006: [Templates] Support @staticmethod and @classmethod (rtyler)
+
2.1.1 (April 16, 2009)
- Support __eq__() and __ne__() the way you might expect in src/Tools/RecursiveNull (patch suggested by Peter Warasin <peter@endian.com>)
- Applied patch to avoid hitting the filesystem to get the file modification time everytime a #include directive is processed (Jean-Baptiste Quenot <jbq@caraldi.com>)