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 2015/09/16 19:59:15 UTC
[15/15] 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
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/53bf6b3b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/53bf6b3b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/53bf6b3b
Branch: refs/heads/2.3
Commit: 53bf6b3b312f492c83d614b8b596010be563c898
Parents: b6d84a0 89ec237
Author: ddekany <dd...@apache.org>
Authored: Wed Sep 16 19:54:37 2015 +0200
Committer: ddekany <dd...@apache.org>
Committed: Wed Sep 16 19:54:37 2015 +0200
----------------------------------------------------------------------
.classpath | 4 +-
.settings/org.eclipse.jdt.core.prefs | 6 +-
build.properties.sample | 1 +
build.xml | 35 +-
ivy.xml | 5 +-
.../core/ExtendedDecimalFormatParser.java | 523 +++++++++++++++++++
.../core/JavaTemplateNumberFormat.java | 7 +-
.../core/JavaTemplateNumberFormatFactory.java | 7 +-
src/main/java/freemarker/core/_Java6.java | 35 ++
src/main/java/freemarker/core/_Java6Impl.java | 45 ++
.../java/freemarker/core/_JavaVersions.java | 77 +++
src/manual/book.xml | 16 +-
.../core/ExtendedDecimalFormatTest.java | 330 ++++++++++++
.../freemarker/template/ConfigurationTest.java | 2 +
14 files changed, 1070 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/53bf6b3b/build.xml
----------------------------------------------------------------------