Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Conflicts:
build.xml
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/b1980af5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/b1980af5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/b1980af5
Branch: refs/heads/2.3
Commit: b1980af5aac427fe158ca4369fb500e78e69f9b1
Parents: 1016b93 3944629
Author: ddekany <[email protected]>
Authored: Sun Jan 3 16:59:15 2016 +0100
Committer: ddekany <[email protected]>
Committed: Sun Jan 3 16:59:15 2016 +0100
----------------------------------------------------------------------
build.xml | 53 ++++++++++++++++++++++++++++-------------------------
1 file changed, 28 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b1980af5/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 31a631a,08024a0..66b9dce
--- a/build.xml
+++ b/build.xml
@@@ -91,7 -91,9 +91,9 @@@
<filter token="version" value="${version}" />
<property name="dist.dir" value="build/dist" />
-
- <property name="dist.archiveBaseName" value="apache-freemarker-gae" />
++ <property name="dist.archiveBaseName" value="apache-freemarker" />
+ <property name="dist.bin.dir"
value="${dist.dir}/bin/${dist.archiveBaseName}" />
+ <property name="dist.src.dir"
value="${dist.dir}/src/${dist.archiveBaseName}-src" />
<!-- ================================================================== -->
<!-- Initialization -->
