Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2018-08-23 14:29:54 +0000
committerLars Vogel2018-08-27 10:41:05 +0000
commit619de2981e39d0870663a18a808ed401ea0d65e9 (patch)
tree52bf96722f8e232f4c5bdbad7b51501c4bd34ca2 /bundles/org.eclipse.compare.win32
parent997c65a4dcb69246b153b4d6e7714db154496b3d (diff)
downloadeclipse.platform.team-619de2981e39d0870663a18a808ed401ea0d65e9.tar.gz
eclipse.platform.team-619de2981e39d0870663a18a808ed401ea0d65e9.tar.xz
eclipse.platform.team-619de2981e39d0870663a18a808ed401ea0d65e9.zip
Bug 535802 - EPL 2.0 conversion for team bundles
Change-Id: I073c57899401ab31237c02f74fe9c049dcaefe5d Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
Diffstat (limited to 'bundles/org.eclipse.compare.win32')
-rw-r--r--bundles/org.eclipse.compare.win32/build.properties9
-rw-r--r--bundles/org.eclipse.compare.win32/plugin.properties9
-rw-r--r--bundles/org.eclipse.compare.win32/plugin.xml9
-rw-r--r--bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/AbstractMergeViewer.java9
-rw-r--r--bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/Activator.java9
-rw-r--r--bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/CompareWin32Messages.java9
-rw-r--r--bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordComparison.java9
-rw-r--r--bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java9
-rw-r--r--bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.properties9
-rw-r--r--bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordViewerCreator.java9
-rw-r--r--bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/messages.properties9
11 files changed, 66 insertions, 33 deletions
diff --git a/bundles/org.eclipse.compare.win32/build.properties b/bundles/org.eclipse.compare.win32/build.properties
index 272025856..7e7abfcd0 100644
--- a/bundles/org.eclipse.compare.win32/build.properties
+++ b/bundles/org.eclipse.compare.win32/build.properties
@@ -1,9 +1,12 @@
###############################################################################
# Copyright (c) 2008, 2011 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.compare.win32/plugin.properties b/bundles/org.eclipse.compare.win32/plugin.properties
index 599b1e5f3..ac06ce38d 100644
--- a/bundles/org.eclipse.compare.win32/plugin.properties
+++ b/bundles/org.eclipse.compare.win32/plugin.properties
@@ -1,9 +1,12 @@
###############################################################################
# Copyright (c) 2009, 2011 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.compare.win32/plugin.xml b/bundles/org.eclipse.compare.win32/plugin.xml
index dd3ba75df..810375298 100644
--- a/bundles/org.eclipse.compare.win32/plugin.xml
+++ b/bundles/org.eclipse.compare.win32/plugin.xml
@@ -2,10 +2,13 @@
<?eclipse version="3.2"?>
<!--
Copyright (c) 2008, 2011 IBM Corporation and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+
+ This program and the accompanying materials
+ are made available under the terms of the Eclipse Public License 2.0
which accompanies this distribution, and is available at
- http://www.eclipse.org/legal/epl-v10.html
+ https://www.eclipse.org/legal/epl-2.0/
+
+ SPDX-License-Identifier: EPL-2.0
Contributors:
IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/AbstractMergeViewer.java b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/AbstractMergeViewer.java
index 2214f2ac7..c898d908c 100644
--- a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/AbstractMergeViewer.java
+++ b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/AbstractMergeViewer.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/Activator.java b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/Activator.java
index 1013283f6..142fec505 100644
--- a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/Activator.java
+++ b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/Activator.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/CompareWin32Messages.java b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/CompareWin32Messages.java
index 686017560..0d4a3d1f7 100644
--- a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/CompareWin32Messages.java
+++ b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/CompareWin32Messages.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordComparison.java b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordComparison.java
index 3b6ac2357..bceda549b 100644
--- a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordComparison.java
+++ b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordComparison.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java
index e64560f19..7a109e39f 100644
--- a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java
+++ b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.properties b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.properties
index 16dccd0fd..bfbb33d1d 100644
--- a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.properties
+++ b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordMergeViewer.properties
@@ -1,9 +1,12 @@
###############################################################################
# Copyright (c) 2008, 2011 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordViewerCreator.java b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordViewerCreator.java
index 126e1b77d..dcf1c2004 100644
--- a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordViewerCreator.java
+++ b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/WordViewerCreator.java
@@ -1,9 +1,12 @@
/*******************************************************************************
* Copyright (c) 2008, 2011 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
*
* Contributors:
* IBM Corporation - initial API and implementation
diff --git a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/messages.properties b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/messages.properties
index f0216e06e..bc80eba80 100644
--- a/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/messages.properties
+++ b/bundles/org.eclipse.compare.win32/src/org/eclipse/compare/internal/win32/messages.properties
@@ -1,9 +1,12 @@
###############################################################################
# Copyright (c) 2008, 2011 IBM Corporation and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
#
# Contributors:
# IBM Corporation - initial API and implementation

Back to the top