Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspingel2011-05-21 17:53:28 +0000
committerspingel2011-05-21 17:53:28 +0000
commit2e5a2cc45805b58f4673a49b94679e0ef4d7fad9 (patch)
treee2c0844b71a24822cd848c5a65db661c7f082c16 /org.eclipse.mylyn-feature
parentdb518e8f0cf6759e4e0f1395412b3c7b87ca92dd (diff)
downloadorg.eclipse.mylyn.tasks-2e5a2cc45805b58f4673a49b94679e0ef4d7fad9.tar.gz
org.eclipse.mylyn.tasks-2e5a2cc45805b58f4673a49b94679e0ef4d7fad9.tar.xz
org.eclipse.mylyn.tasks-2e5a2cc45805b58f4673a49b94679e0ef4d7fad9.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-feature')
-rw-r--r--org.eclipse.mylyn-feature/feature.properties3
-rw-r--r--org.eclipse.mylyn-feature/license.html3
2 files changed, 4 insertions, 2 deletions
diff --git a/org.eclipse.mylyn-feature/feature.properties b/org.eclipse.mylyn-feature/feature.properties
index d09714fc5..4007e3a12 100644
--- a/org.eclipse.mylyn-feature/feature.properties
+++ b/org.eclipse.mylyn-feature/feature.properties
@@ -17,7 +17,7 @@ discovery_Mylyn_Extras=Mylyn Extras
discovery_Mylyn=Mylyn
license=\
Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
+February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
@@ -86,6 +86,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-feature/license.html b/org.eclipse.mylyn-feature/license.html
index c184ca36a..f19c483b9 100644
--- a/org.eclipse.mylyn-feature/license.html
+++ b/org.eclipse.mylyn-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