freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [7/9] incubator-freemarker git commit: Merge branch '3' into feature/FREEMARKER-55-2
Date Thu, 14 Sep 2017 09:14:16 GMT
Merge branch '3' into feature/FREEMARKER-55-2


Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/ba180d03
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/ba180d03
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/ba180d03

Branch: refs/heads/3
Commit: ba180d0337358fe2136b5a059cbfb98bd1ac6900
Parents: ed955ce 742ed4f
Author: Woonsan Ko <woonsan@apache.org>
Authored: Wed Sep 13 21:36:54 2017 -0400
Committer: Woonsan Ko <woonsan@apache.org>
Committed: Wed Sep 13 21:36:54 2017 -0400

----------------------------------------------------------------------
 .../freemarker/core/ASTDollarInterpolation.java |  2 +-
 .../freemarker/core/ASTExpAddOrConcat.java      |  4 +--
 .../apache/freemarker/core/ASTExpression.java   |  8 +++---
 .../core/BuiltInForLegacyEscaping.java          |  2 +-
 .../core/BuiltInsForOutputFormatRelated.java    |  2 +-
 .../freemarker/core/BuiltInsForSequences.java   |  2 +-
 .../org/apache/freemarker/core/Environment.java | 28 ++++++++++++++++++++
 .../org/apache/freemarker/core/_EvalUtils.java  | 12 ++++-----
 8 files changed, 44 insertions(+), 16 deletions(-)
----------------------------------------------------------------------



Mime
View raw message