[5/5] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3

2018-03-12 Thread ddekany
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/0c69b198
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/0c69b198
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/0c69b198

Branch: refs/heads/2.3
Commit: 0c69b19832c4cc2fb843080b00b281216d06618e
Parents: 5bfa9ac 0c77097
Author: ddekany 
Authored: Mon Mar 12 07:06:02 2018 +0100
Committer: ddekany 
Committed: Mon Mar 12 07:06:02 2018 +0100

--
 .../java/freemarker/core/ArithmeticEngine.java  | 110 +--
 src/main/java/freemarker/core/BuiltIn.java  |   4 +-
 .../freemarker/core/BuiltInsForSequences.java   |  68 
 .../template/DefaultIterableAdapter.java|   2 +-
 .../freemarker/template/utility/NumberUtil.java |  13 ++-
 src/manual/en_US/book.xml   |  67 ++-
 .../core/BigDecimalArithmeticEngineTest.java|  97 
 src/test/java/freemarker/core/MinMaxBITest.java |  87 +++
 8 files changed, 434 insertions(+), 14 deletions(-)
--




[5/5] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3

2017-10-08 Thread ddekany
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/e5db86b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/e5db86b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/e5db86b3

Branch: refs/heads/2.3
Commit: e5db86b36cd2e67d100eaa9e29e92d7b675cdf82
Parents: e719094 15b97af
Author: ddekany 
Authored: Sun Oct 8 20:42:46 2017 +0200
Committer: ddekany 
Committed: Sun Oct 8 20:42:46 2017 +0200

--
 .../freemarker/ext/beans/UnsafeMethods.java | 15 +---
 .../java/freemarker/ext/jsp/TaglibFactory.java  |  9 +-
 .../java/freemarker/template/Configuration.java | 16 +---
 .../freemarker/template/utility/ClassUtil.java  | 94 
 src/manual/en_US/book.xml   | 18 +++-
 5 files changed, 104 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/e5db86b3/src/manual/en_US/book.xml
--



[5/5] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3

2017-03-15 Thread ddekany
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/876fffcf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/876fffcf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/876fffcf

Branch: refs/heads/2.3
Commit: 876fffcfaf66bd212b02a931fdd2c69f6e0c297e
Parents: a3fb59d 4356485
Author: ddekany 
Authored: Wed Mar 15 21:04:30 2017 +0100
Committer: ddekany 
Committed: Wed Mar 15 21:04:30 2017 +0100

--
 build.xml   | 10 +
 osgi.bnd|  4 +-
 .../resources/freemarker/version.properties |  8 ++--
 src/manual/en_US/book.xml   | 47 
 4 files changed, 36 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/876fffcf/build.xml
--

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/876fffcf/src/main/resources/freemarker/version.properties
--