Merge remote-tracking branch 'origin/2.3-gae'
Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/d7584c46 Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/d7584c46 Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/d7584c46 Branch: refs/heads/master Commit: d7584c46cb1a2ea40a8e097aa96b94411cce5878 Parents: 991e284 c1f7364 Author: ddekany <[email protected]> Authored: Thu Sep 3 01:22:36 2015 +0200 Committer: ddekany <[email protected]> Committed: Thu Sep 3 01:23:06 2015 +0200 ---------------------------------------------------------------------- build.xml | 9 +++++---- src/dist/DISCLAIMER | 8 ++++++++ 2 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/d7584c46/build.xml ---------------------------------------------------------------------- diff --cc build.xml index 98419ff,03ac2fb..5924c5c --- a/build.xml +++ b/build.xml @@@ -730,9 -730,10 +730,10 @@@ </license> </licenses> <scm> - <connection>scm:git:[email protected]:freemarker/freemarker.git</connection> - <developerConnection>scm:git:[email protected]:freemarker/freemarker.git</developerConnection> - <url>[email protected]:freemarker/freemarker.git</url> + <connection>scm:git:https://git-wip-us.apache.org/repos/asf/incubator-freemarker.git</connection> + <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/maven.git</developerConnection> + <!-- <url>https://github.com/apache/freemarker/tree/${project.scm.tag}</url> --> - <tag>2.3-gae</tag> ++ <tag>master</tag> </scm> <developers> <developer>
