Merge commit 'refs/pull/16/head' of https://github.com/apache/incubator-freemarker into 2.3-gae
Summary of the merged branch: Create $project/META-INF/MANIFEST.MF as part of the ide-dependencies Ant task by extracting it from freemarker.jar. Thus other bundles in the same Eclipse workspace will recognize the Freemarker Workspace project. The somewhat unfortunate location (the project root directory) is expected by Eclipse. Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/a33aaba4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/a33aaba4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/a33aaba4 Branch: refs/heads/2.3 Commit: a33aaba430f151c9074cb2968954b7f637a5d028 Parents: 4b989f8 f2adf1a Author: ddekany <[email protected]> Authored: Wed Jan 4 14:22:25 2017 +0100 Committer: ddekany <[email protected]> Committed: Wed Jan 4 14:32:42 2017 +0100 ---------------------------------------------------------------------- .gitignore | 1 + README | 4 ++-- build.xml | 10 ++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) ----------------------------------------------------------------------
