Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVivian Kong2011-05-19 20:59:10 -0400
committerVivian Kong2011-05-19 20:59:10 -0400
commitc82cbe55fbc17aee75becc643ee3429f8cb830e3 (patch)
treeaaf73f98ea19100162f29e13f33380729d729e1c /upc/org.eclipse.cdt.core.parser.upc.feature
parent8d7890cb737e1fdc87fd8e184b7a13c5d91de6c6 (diff)
downloadorg.eclipse.cdt-c82cbe55fbc17aee75becc643ee3429f8cb830e3.tar.gz
org.eclipse.cdt-c82cbe55fbc17aee75becc643ee3429f8cb830e3.tar.xz
org.eclipse.cdt-c82cbe55fbc17aee75becc643ee3429f8cb830e3.zip
Bug 346568 - Update licenses for Indigo
Diffstat (limited to 'upc/org.eclipse.cdt.core.parser.upc.feature')
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.feature/feature.properties3
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.feature/license.html3
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/feature.properties3
-rw-r--r--upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/license.html3
4 files changed, 8 insertions, 4 deletions
diff --git a/upc/org.eclipse.cdt.core.parser.upc.feature/feature.properties b/upc/org.eclipse.cdt.core.parser.upc.feature/feature.properties
index 278b70a6923..b51fd817936 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.feature/feature.properties
+++ b/upc/org.eclipse.cdt.core.parser.upc.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/upc/org.eclipse.cdt.core.parser.upc.feature/license.html b/upc/org.eclipse.cdt.core.parser.upc.feature/license.html
index c184ca36a99..f19c483b9c8 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.feature/license.html
+++ b/upc/org.eclipse.cdt.core.parser.upc.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>
diff --git a/upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/feature.properties b/upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/feature.properties
index 46650ced6f0..c22835d3cb3 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/feature.properties
+++ b/upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/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/upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/license.html b/upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/license.html
index c184ca36a99..f19c483b9c8 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/license.html
+++ b/upc/org.eclipse.cdt.core.parser.upc.feature/sourceTemplateFeature/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