freemarker-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ddek...@apache.org
Subject [2/2] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3-gae'
Date Sun, 03 Jan 2016 16:02:47 GMT
Merge remote-tracking branch 'origin/2.3-gae'

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/f2d0de0a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/f2d0de0a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/f2d0de0a

Branch: refs/heads/master
Commit: f2d0de0ab9c9555e3a56e665542ecc165a359265
Parents: 4045daa 3944629
Author: ddekany <ddekany@apache.org>
Authored: Sun Jan 3 17:02:40 2016 +0100
Committer: ddekany <ddekany@apache.org>
Committed: Sun Jan 3 17:02:40 2016 +0100

----------------------------------------------------------------------
 build.xml | 53 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 25 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f2d0de0a/build.xml
----------------------------------------------------------------------
diff --cc build.xml
index 8bfe4ca,08024a0..3bb44e5
--- 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                                                     -->


Mime
View raw message