Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorspingel2009-09-02 00:39:54 +0000
committerspingel2009-09-02 00:39:54 +0000
commit1e3b87cd96254b3da7d7f6d9e74c8d877e080a5d (patch)
tree54e56fb686647ddabd685d6a100103393fbe571c
parenta085d044bf6dcb7827d9295197e105ec8854881d (diff)
downloadorg.eclipse.mylyn.tasks-1e3b87cd96254b3da7d7f6d9e74c8d877e080a5d.tar.gz
org.eclipse.mylyn.tasks-1e3b87cd96254b3da7d7f6d9e74c8d877e080a5d.tar.xz
org.eclipse.mylyn.tasks-1e3b87cd96254b3da7d7f6d9e74c8d877e080a5d.zip
NEW - bug 288312: fix line breaks in feature.properties
https://bugs.eclipse.org/bugs/show_bug.cgi?id=288312
-rw-r--r--org.eclipse.mylyn-feature/feature.properties4
-rw-r--r--org.eclipse.mylyn.bugzilla-feature/feature.properties4
-rw-r--r--org.eclipse.mylyn.sdk-feature/feature.properties2
3 files changed, 7 insertions, 3 deletions
diff --git a/org.eclipse.mylyn-feature/feature.properties b/org.eclipse.mylyn-feature/feature.properties
index 6aad425a7..3bb0caa3a 100644
--- a/org.eclipse.mylyn-feature/feature.properties
+++ b/org.eclipse.mylyn-feature/feature.properties
@@ -17,11 +17,12 @@ discovery_Mylyn_Extras=Mylyn Extras
discovery_Mylyn=Mylyn
license=\
Eclipse Foundation Software User Agreement\n\
-\n\
March 17, 2005\n\
+\n\
Usage Of Content\n\
\n\
THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
Applicable Licenses\n\
\n\
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.\n\
@@ -53,6 +54,7 @@ THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL O
* Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
\n\
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.\n\
+\n\
Cryptography\n\
\n\
Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.\n\
diff --git a/org.eclipse.mylyn.bugzilla-feature/feature.properties b/org.eclipse.mylyn.bugzilla-feature/feature.properties
index 06d824dc3..5a69c98f2 100644
--- a/org.eclipse.mylyn.bugzilla-feature/feature.properties
+++ b/org.eclipse.mylyn.bugzilla-feature/feature.properties
@@ -15,11 +15,12 @@ copyright=Copyright (c) 2004, 2009 Tasktop Technologies and others. All rights r
updateSiteName=Mylyn for Eclipse 3.4
license=\
Eclipse Foundation Software User Agreement\n\
-\n\
March 17, 2005\n\
+\n\
Usage Of Content\n\
\n\
THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT"). USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
+\n\
Applicable Licenses\n\
\n\
Unless otherwise indicated, all Content made available by the Eclipse Foundation is provided to you under the terms and conditions of the Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is provided with this Content and is also available at http://www.eclipse.org/legal/epl-v10.html. For purposes of the EPL, "Program" will mean the Content.\n\
@@ -51,6 +52,7 @@ THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL O
* Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
\n\
IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT. If no About, Feature License, or Feature Update License is provided, please contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.\n\
+\n\
Cryptography\n\
\n\
Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import, possession, or use, and re-export of encryption software, to see if this is permitted.\n\
diff --git a/org.eclipse.mylyn.sdk-feature/feature.properties b/org.eclipse.mylyn.sdk-feature/feature.properties
index 7dbe5b7c1..27d039a75 100644
--- a/org.eclipse.mylyn.sdk-feature/feature.properties
+++ b/org.eclipse.mylyn.sdk-feature/feature.properties
@@ -11,7 +11,7 @@
featureName=Mylyn SDK
description=Provides sources for the Mylyn Task List, Focused UI and Integration features, and sources for Mylyn WikiText.\n\Also includes the Mylyn WikiText Developer Guide.
providerName=Eclipse Mylyn
-copyright=Copyright (c) 2004, 2008 Mylyn project committers and others.
+copyright=Copyright (c) 2004, 2009 Tasktop Technologies and others. All rights reserved.
updateSiteName=Mylyn for Eclipse 3.4
license=\
Eclipse Foundation Software User Agreement\n\

Back to the top