Author: hibou
Date: Sat Nov 9 13:51:36 2013
New Revision: 1540304
URL: http://svn.apache.org/r1540304
Log:
Merged revisions 1540300-1540303 via svnmerge from
https://svn.apache.org/repos/asf/ant/ivy/ivyde/trunk
........
r1540302 | hibou | 2013-11-09 14:48:40 +0100 (Sat, 09 Nov 2013) | 2 lines
fix copyright year in templates
........
r1540303 | hibou | 2013-11-09 14:50:33 +0100 (Sat, 09 Nov 2013) | 2 lines
fix copyright year in templates
........
Modified:
ant/ivy/ivyde/branches/2.2.0.final/ (props changed)
ant/ivy/ivyde/branches/2.2.0.final/doc/printTemplate.html
ant/ivy/ivyde/branches/2.2.0.final/doc/template-eclipse.html
ant/ivy/ivyde/branches/2.2.0.final/doc/template.html
Propchange: ant/ivy/ivyde/branches/2.2.0.final/
------------------------------------------------------------------------------
Merged /ant/ivy/ivyde/trunk:r1540302-1540303
Propchange: ant/ivy/ivyde/branches/2.2.0.final/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sat Nov 9 13:51:36 2013
@@ -1 +1 @@
-/ant/ivy/ivyde/trunk:1-1540299
+/ant/ivy/ivyde/trunk:1-1540303
Modified: ant/ivy/ivyde/branches/2.2.0.final/doc/printTemplate.html
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/branches/2.2.0.final/doc/printTemplate.html?rev=1540304&r1=1540303&r2=1540304&view=diff
==============================================================================
--- ant/ivy/ivyde/branches/2.2.0.final/doc/printTemplate.html (original)
+++ ant/ivy/ivyde/branches/2.2.0.final/doc/printTemplate.html Sat Nov 9
13:51:36 2013
@@ -47,7 +47,7 @@
<div id="footer-message" class="footer">
<hr />
- <i>Copyright © 2012 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt";>Apache License,
Version 2.0</a>.</i><br />
+ <i>Copyright © 2013 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt";>Apache License,
Version 2.0</a>.</i><br />
<i>Apache IvyDE, Apache Ivy, Apache Ant, IvyDE, Ivy, Ant, Apache, the
Apache IvyDE logo, the Apache Ivy logo, the Apache Ant logo and the Apache
feather logo are trademarks of The Apache Software Foundation.</i><br />
<i>Eclipse and the Eclipse logo are trademarks of Eclipse Foundation,
Inc.</i>
<i>All other marks mentioned may be trademarks or registered trademarks of
their respective owners. </i>
Modified: ant/ivy/ivyde/branches/2.2.0.final/doc/template-eclipse.html
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/branches/2.2.0.final/doc/template-eclipse.html?rev=1540304&r1=1540303&r2=1540304&view=diff
==============================================================================
--- ant/ivy/ivyde/branches/2.2.0.final/doc/template-eclipse.html (original)
+++ ant/ivy/ivyde/branches/2.2.0.final/doc/template-eclipse.html Sat Nov 9
13:51:36 2013
@@ -36,7 +36,7 @@ body {
<div id="footer-message" class="footer">
<hr />
- <i>Copyright © 2012 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt";>Apache License,
Version 2.0</a>.</i><br />
+ <i>Copyright © 2013 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt";>Apache License,
Version 2.0</a>.</i><br />
<i>Apache IvyDE, Apache Ivy, Apache Ant, IvyDE, Ivy, Ant, Apache, the
Apache IvyDE logo, the Apache Ivy logo, the Apache Ant logo and the Apache
feather logo are trademarks of The Apache Software Foundation.</i><br />
<i>Eclipse and the Eclipse logo are trademarks of Eclipse Foundation,
Inc.</i>
<i>All other marks mentioned may be trademarks or registered trademarks of
their respective owners. </i>
Modified: ant/ivy/ivyde/branches/2.2.0.final/doc/template.html
URL:
http://svn.apache.org/viewvc/ant/ivy/ivyde/branches/2.2.0.final/doc/template.html?rev=1540304&r1=1540303&r2=1540304&view=diff
==============================================================================
--- ant/ivy/ivyde/branches/2.2.0.final/doc/template.html (original)
+++ ant/ivy/ivyde/branches/2.2.0.final/doc/template.html Sat Nov 9 13:51:36
2013
@@ -100,7 +100,7 @@
<div id="footer-message" class="footer">
<hr />
- <i>Copyright © 2012 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt";>Apache License,
Version 2.0</a>.</i><br />
+ <i>Copyright © 2013 The Apache Software Foundation, Licensed under
the <a href="http://www.apache.org/licenses/LICENSE-2.0.txt";>Apache License,
Version 2.0</a>.</i><br />
<i>Apache IvyDE, Apache Ivy, Apache Ant, IvyDE, Ivy, Ant, Apache, the
Apache IvyDE logo, the Apache Ivy logo, the Apache Ant logo and the Apache
feather logo are trademarks of The Apache Software Foundation.</i><br />
<i>Eclipse and the Eclipse logo are trademarks of Eclipse Foundation,
Inc.</i>
<i>All other marks mentioned may be trademarks or registered trademarks of
their respective owners. </i>
