Merge branch '3' into feature/FREEMARKER-55
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/c2589eeb Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/c2589eeb Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/c2589eeb Branch: refs/heads/3 Commit: c2589eeb0517006715d427b591d186fafff7a32b Parents: cb4fab3 c5feb63 Author: Woonsan Ko <woon...@apache.org> Authored: Thu Jun 29 23:31:44 2017 -0400 Committer: Woonsan Ko <woon...@apache.org> Committed: Thu Jun 29 23:31:44 2017 -0400 ---------------------------------------------------------------------- .../core/FM2ASTToFM3SourceConverter.java | 115 ++++++++++++++++++- .../converter/FM2ToFM3ConverterTest.java | 18 +++ 2 files changed, 129 insertions(+), 4 deletions(-) ----------------------------------------------------------------------