tema
 

Commit (click to see the diff): 665309ccd5e6ab6d02448e22f740951b76bbc0fc

Merge.

Mikhail Kryshen

Diffstat

changeset:   25:665309ccd5e6
parent:      24:d3a8871e6e73
parent:      23:55fe63bb7858
user:        Mikhail Kryshen 
date:        Mon May 11 20:19:02 2009 +0400
summary:     Merge.

 doc/manual/manual.tema                   |   4 ++--
 src/kryshen/tema/FunctionDataParser.java |   8 ++++++--
 src/kryshen/tema/GlobalContext.java      |   2 +-
 src/kryshen/tema/Tema.java               |   6 +-----
 src/kryshen/tema/TemplateParser.java     |  24 ++++++++++++++----------
 src/kryshen/tema/functions/Control.java  |   5 ++++-
 src/kryshen/tema/functions/IO.java       |   4 ++--
 7 files changed, 30 insertions(+), 23 deletions(-)

Files in this revision