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>
cheetahtemplate · May 12, 2009 · aacd468 · aacd468
2 parents 303e674 + f2c1e61
commit aacd468
Show file tree

Hide file tree

Showing 88 changed files with 5 additions and 16,665 deletions.
diff --git 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>)

diff --git a/docs/COPYING b/docs/COPYING