Skip to main content
summaryrefslogtreecommitdiffstats
path: root/releng
diff options
context:
space:
mode:
authorOlivier Constant2018-09-07 08:56:53 +0000
committerOlivier Constant2018-09-07 14:02:16 +0000
commitf5683739559038156728caa0dfe5587a10b000f4 (patch)
tree5071bfc7a9479498fd65ebf5fe045962aae6ea38 /releng
parentf7462bf1d5a65c9c80ba884b2bce391a89b7a08d (diff)
downloadorg.eclipse.emf.diffmerge.core-f5683739559038156728caa0dfe5587a10b000f4.tar.gz
org.eclipse.emf.diffmerge.core-f5683739559038156728caa0dfe5587a10b000f4.tar.xz
org.eclipse.emf.diffmerge.core-f5683739559038156728caa0dfe5587a10b000f4.zip
Bug 535213 - Switch to EPL-2.0
Change-Id: I3f390723a7e60d97e38cf74e5d0c6bfb03c0325c Signed-off-by: Olivier Constant <olivier.constant@thalesgroup.com>
Diffstat (limited to 'releng')
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF3
-rw-r--r--releng/org.eclipse.emf.diffmerge.core.javadoc/about.html25
2 files changed, 27 insertions, 1 deletions
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF b/releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF
index 8149782b..2d42ba85 100644
--- a/releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/META-INF/MANIFEST.MF
@@ -1,6 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: Javadoc for DiffMerge Core
+Bundle-Name: Javadoc for Diff/Merge Core (Incubation)
Bundle-SymbolicName: org.eclipse.emf.diffmerge.core.javadoc
Bundle-Version: 0.10.0.qualifier
Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Automatic-Module-Name: org.eclipse.emf.diffmerge.core.javadoc
diff --git a/releng/org.eclipse.emf.diffmerge.core.javadoc/about.html b/releng/org.eclipse.emf.diffmerge.core.javadoc/about.html
new file mode 100644
index 00000000..720a1d06
--- /dev/null
+++ b/releng/org.eclipse.emf.diffmerge.core.javadoc/about.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
+<title>About</title>
+</head>
+<body lang="EN-US">
+<h2>About This Content</h2>
+
+<p>August 17, 2018</p>
+<h3>License</h3>
+<p>The Eclipse Foundation makes available all content in this plug-in (&quot;Content&quot;). Unless otherwise
+indicated below, the Content is provided to you under the terms and conditions of the
+Eclipse Public License Version 2.0 (&quot;EPL&quot;). A copy of the EPL is available
+at <a href="https://www.eclipse.org/legal/epl-2.0">https://www.eclipse.org/legal/epl-2.0</a>.
+For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+<p>If you did not receive this Content directly from the Eclipse Foundation, the Content is
+being redistributed by another party (&quot;Redistributor&quot;) and different terms and conditions may
+apply to your use of any object code in the Content. Check the Redistributor's license that was
+provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise
+indicated below, the terms and conditions of the EPL still apply to any source code in the Content
+and such source code may be obtained at <a href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
+</body>
+</html> \ No newline at end of file

Back to the top