Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarkus Knauer2011-05-19 05:55:22 -0400
committerMarkus Knauer2011-05-19 05:55:22 -0400
commit96d86d70a9d222cce58e803efcf42a467edc62df (patch)
tree617e52f5755609103bbce706a37a8ba8ab96d7b2 /packages/org.eclipse.epp.package.rcp.feature
parentcb861f640c0076cef2cdf0b9201ca3becc84d469 (diff)
downloadorg.eclipse.epp.packages-96d86d70a9d222cce58e803efcf42a467edc62df.tar.gz
org.eclipse.epp.packages-96d86d70a9d222cce58e803efcf42a467edc62df.tar.xz
org.eclipse.epp.packages-96d86d70a9d222cce58e803efcf42a467edc62df.zip
* all: Bug 346410 - Indigo license update of all EPP packages
Diffstat (limited to 'packages/org.eclipse.epp.package.rcp.feature')
-rw-r--r--packages/org.eclipse.epp.package.rcp.feature/feature.properties3
-rw-r--r--packages/org.eclipse.epp.package.rcp.feature/license.html3
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/org.eclipse.epp.package.rcp.feature/feature.properties b/packages/org.eclipse.epp.package.rcp.feature/feature.properties
index 751dbe9c..026d2fee 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/feature.properties
+++ b/packages/org.eclipse.epp.package.rcp.feature/feature.properties
@@ -6,7 +6,7 @@ licenseURL=license.html
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
Eclipse Foundation Software User Agreement\n\
-April 14, 2010\n\
+February 1, 2011\n\
\n\
Usage Of Content\n\
\n\
@@ -75,6 +75,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/packages/org.eclipse.epp.package.rcp.feature/license.html b/packages/org.eclipse.epp.package.rcp.feature/license.html
index c184ca36..f19c483b 100644
--- a/packages/org.eclipse.epp.package.rcp.feature/license.html
+++ b/packages/org.eclipse.epp.package.rcp.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