Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspingel2011-05-21 17:53:26 +0000
committerspingel2011-05-21 17:53:26 +0000
commitbd1608bdaec754943a2028f7f16ad6f8ccb157aa (patch)
tree75a92a8ba33808bf601cbb1e39bdfb68324f3cd3 /org.eclipse.mylyn.trac.wiki-feature
parent02d2d18e59ddea9d2f68d13bdb2a515514c150d2 (diff)
downloadorg.eclipse.mylyn.incubator-bd1608bdaec754943a2028f7f16ad6f8ccb157aa.tar.gz
org.eclipse.mylyn.incubator-bd1608bdaec754943a2028f7f16ad6f8ccb157aa.tar.xz
org.eclipse.mylyn.incubator-bd1608bdaec754943a2028f7f16ad6f8ccb157aa.zip
NEW - bug 345021: update Eclipse SUA for all features
https://bugs.eclipse.org/bugs/show_bug.cgi?id=345021
Diffstat (limited to 'org.eclipse.mylyn.trac.wiki-feature')
-rw-r--r--org.eclipse.mylyn.trac.wiki-feature/feature.properties3
-rw-r--r--org.eclipse.mylyn.trac.wiki-feature/license.html3
2 files changed, 4 insertions, 2 deletions
diff --git a/org.eclipse.mylyn.trac.wiki-feature/feature.properties b/org.eclipse.mylyn.trac.wiki-feature/feature.properties
index b0af25cc..cd7abdba 100644
--- a/org.eclipse.mylyn.trac.wiki-feature/feature.properties
+++ b/org.eclipse.mylyn.trac.wiki-feature/feature.properties
@@ -15,7 +15,7 @@ copyright=Copyright (c) 2007, 2011 Tasktop Technologies and others. All rights r
license=\
Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
+February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
@@ -84,6 +84,7 @@ THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER\n\
TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
\n\
+ - Eclipse Distribution License Version 1.0 (available at http://www.eclipse.org/licenses/edl-v1.0.html)\n\
- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
diff --git a/org.eclipse.mylyn.trac.wiki-feature/license.html b/org.eclipse.mylyn.trac.wiki-feature/license.html
index c184ca36..f19c483b 100644
--- a/org.eclipse.mylyn.trac.wiki-feature/license.html
+++ b/org.eclipse.mylyn.trac.wiki-feature/license.html
@@ -8,7 +8,7 @@
<body lang="EN-US">
<h2>Eclipse Foundation Software User Agreement</h2>
-<p>April 14, 2010</p>
+<p>February 1, 2011</p>
<h3>Usage Of Content</h3>
@@ -58,6 +58,7 @@ that directory.</p>
OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
<ul>
+ <li>Eclipse Distribution License Version 1.0 (available at <a href="http://www.eclipse.org/licenses/edl-v10.html">http://www.eclipse.org/licenses/edl-v1.0.html</a>)</li>
<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>

Back to the top