freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [6/6] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3.24-gae-stabilization' into 2.3.24-stabilization
Date Tue, 15 Mar 2016 10:04:25 GMT
Merge remote-tracking branch 'origin/2.3.24-gae-stabilization' into 2.3.24-stabilization


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

Branch: refs/heads/2.3.24-stabilization
Commit: 974d66503b909751064ad2187515e95bfe3ea1c0
Parents: bbbfbae 021d95d
Author: ddekany <ddekany@apache.org>
Authored: Tue Mar 15 11:00:01 2016 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Tue Mar 15 11:00:01 2016 +0100

----------------------------------------------------------------------
 README                                          |  25 ++--
 .../freemarker/cache/WebappTemplateLoader.java  |   2 +-
 .../core/CommonTemplateMarkupOutputModel.java   |   9 +-
 .../freemarker/core/MarkupOutputFormat.java     |  26 ++--
 src/main/java/freemarker/core/OutputFormat.java |   2 +-
 .../freemarker/core/TemplateConfiguration.java  |   4 +-
 .../core/TemplateMarkupOutputModel.java         |  21 ++--
 .../java/freemarker/template/Configuration.java |  24 ++--
 .../template/DefaultObjectWrapper.java          |   2 +-
 .../freemarker/template/utility/StringUtil.java |   8 +-
 src/manual/en_US/book.xml                       | 126 +++++++++++++------
 .../java/freemarker/core/OutputFormatTest.java  |   2 +-
 12 files changed, 162 insertions(+), 89 deletions(-)
----------------------------------------------------------------------



Mime
View raw message