You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2017/10/08 17:53:41 UTC
[3/3] incubator-netbeans git commit: Merge branch 'pr/91'
Merge branch 'pr/91'
This closes #91
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/c7feafa6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/c7feafa6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/c7feafa6
Branch: refs/heads/master
Commit: c7feafa6287a09cb9c726a3c010ed325245d7167
Parents: 85cd0e9 e016b53
Author: Matthias Bläsing <mb...@doppel-helix.eu>
Authored: Sun Oct 8 19:53:13 2017 +0200
Committer: Matthias Bläsing <mb...@doppel-helix.eu>
Committed: Sun Oct 8 19:53:13 2017 +0200
----------------------------------------------------------------------
libs.freemarker/external/binaries-list | 2 +-
.../external/freemarker-2.3.19-notice.txt | 2 +
.../libs/freemarker/FreemarkerEngine.java | 46 +++++++-------------
.../libs/freemarker/FreemarkerFactory.java | 46 +++++++-------------
.../org/netbeans/freemarker/templates/utf8.xml | 20 +++++++++
nbbuild/build.xml | 1 +
6 files changed, 54 insertions(+), 63 deletions(-)
----------------------------------------------------------------------