Merge branch 'f_templates' into mk
commit620e1ace5b8df2b6c6218eb7ed21a3dbcc685973
authorMichal Kottman <michal.kottman@gmail.com>
Wed, 24 Feb 2010 22:15:05 +0000 (24 23:15 +0100)
committerMichal Kottman <michal.kottman@gmail.com>
Wed, 24 Feb 2010 22:15:05 +0000 (24 23:15 +0100)
treeae5130010fe7e567ef785590a0ec6568e813ac1c
parentb91585ee00b9cabf5eff5bad65faf31d0596ff84
parent962f34e778c72b27cc9599737a6a4d0124ac4ffe
Merge branch 'f_templates' into mk
generator/generator.lua