freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [3/3] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae' into 2.3
Date Thu, 07 Jan 2016 12:20:59 GMT
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/599e0fdb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/599e0fdb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/599e0fdb

Branch: refs/heads/2.3
Commit: 599e0fdbe36cae76008af1aa1cd62e4f4345111e
Parents: b1980af da6180e
Author: ddekany <ddekany@apache.org>
Authored: Thu Jan 7 13:20:50 2016 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Thu Jan 7 13:20:50 2016 +0100

----------------------------------------------------------------------
 LICENSE              |  34 ------
 NOTICE               |  28 +++++
 build.xml            |   9 +-
 src/dist/bin/LICENSE | 257 ----------------------------------------------
 src/dist/bin/NOTICE  |  28 ++++-
 5 files changed, 60 insertions(+), 296 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/599e0fdb/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 66b9dce,b072cc5..9239fcd
--- a/build.xml
+++ b/build.xml
@@@ -91,7 -91,7 +91,7 @@@
    <filter token="version" value="${version}" />
    
    <property name="dist.dir" value="build/dist" />
-   <property name="dist.archiveBaseName" value="apache-freemarker" />
 -  <property name="dist.archiveBaseName" value="apache-freemarker-gae-${version}" />
++  <property name="dist.archiveBaseName" value="apache-freemarker-${version}" />
    <property name="dist.bin.dir" value="${dist.dir}/bin/${dist.archiveBaseName}" />
    <property name="dist.src.dir" value="${dist.dir}/src/${dist.archiveBaseName}-src" />
    


Mime
View raw message