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/b375e147 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/b375e147 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/b375e147 Branch: refs/heads/3 Commit: b375e1478f3ef3f5c12ac51890454c810e3dc057 Parents: 9083de1 507b89b Author: Woonsan Ko <[email protected]> Authored: Sun Jul 2 01:25:49 2017 -0400 Committer: Woonsan Ko <[email protected]> Committed: Sun Jul 2 01:25:49 2017 -0400 ---------------------------------------------------------------------- .../core/FM2ASTToFM3SourceConverter.java | 209 +++++++++++++++++-- .../core/UnexpectedNodeContentException.java | 17 +- .../converter/FM2ToFM3ConverterTest.java | 30 +++ 3 files changed, 234 insertions(+), 22 deletions(-) ----------------------------------------------------------------------
