You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@freemarker.apache.org by dd...@apache.org on 2017/11/05 22:44:14 UTC
[10/10] incubator-freemarker git commit: Merge remote-tracking branch
'origin/2.3-gae' into 2.3
Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Conflicts:
src/main/resources/freemarker/version.properties
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/bda2c839
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/bda2c839
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/bda2c839
Branch: refs/heads/2.3
Commit: bda2c839c942f6729cba43512f708ffce7305021
Parents: aba2220 89c1d45
Author: ddekany <dd...@apache.org>
Authored: Sun Nov 5 23:43:47 2017 +0100
Committer: ddekany <dd...@apache.org>
Committed: Sun Nov 5 23:43:47 2017 +0100
----------------------------------------------------------------------
README.md | 8 +-
build.xml | 4 +-
src/main/java/freemarker/core/Environment.java | 64 +++++++--------
src/main/java/freemarker/core/MessageUtil.java | 4 +-
.../java/freemarker/ext/beans/HashAdapter.java | 9 +++
.../freemarker/template/TemplateHashModel.java | 4 +-
.../template/TemplateHashModelEx.java | 7 +-
src/main/javacc/FTL.jj | 85 +++++++++-----------
.../resources/freemarker/version.properties | 9 ++-
src/manual/en_US/book.xml | 4 +-
src/manual/en_US/docgen.cjson | 16 ++--
.../template/DefaultObjectWrapperTest.java | 1 +
12 files changed, 110 insertions(+), 105 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bda2c839/build.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/bda2c839/src/main/resources/freemarker/version.properties
----------------------------------------------------------------------