diff options
| author | dschaefer | 2011-06-06 15:51:58 +0000 |
|---|---|---|
| committer | dschaefer | 2011-06-06 15:51:58 +0000 |
| commit | 9029b3786922415c6318f153f53e261e36839300 (patch) | |
| tree | 67c3b1701f00aa276e09cc70ebba56902ea67e31 | |
| parent | ff441056aad73a3f0ce6ddb4032bdb4b55b9d88c (diff) | |
| download | org.eclipse.tcf-9029b3786922415c6318f153f53e261e36839300.tar.gz org.eclipse.tcf-9029b3786922415c6318f153f53e261e36839300.tar.xz org.eclipse.tcf-9029b3786922415c6318f153f53e261e36839300.zip | |
Updated Feature license to included EDL.
| -rw-r--r-- | features/org.eclipse.tm.tcf.feature/feature.properties | 3 | ||||
| -rw-r--r-- | features/org.eclipse.tm.tcf.feature/license.html | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/features/org.eclipse.tm.tcf.feature/feature.properties b/features/org.eclipse.tm.tcf.feature/feature.properties index 84785b1c5..41871ec34 100644 --- a/features/org.eclipse.tm.tcf.feature/feature.properties +++ b/features/org.eclipse.tm.tcf.feature/feature.properties @@ -42,7 +42,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\ @@ -111,6 +111,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/features/org.eclipse.tm.tcf.feature/license.html b/features/org.eclipse.tm.tcf.feature/license.html index c184ca36a..f19c483b9 100644 --- a/features/org.eclipse.tm.tcf.feature/license.html +++ b/features/org.eclipse.tm.tcf.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> |