Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2018-05-29 19:47:09 -0400
committerMatthias Sohn2018-05-29 19:47:30 -0400
commit8a7768c6d9112fbf1258e755ce71b3a98cefa35f (patch)
treea3586239f442345438dd247126a927f34e874933 /org.eclipse.egit
parentf8d69ebbfa7788f2e0b8ed416dac128aec3ed9dd (diff)
parent4412ce46de90199a83086e5342a36c0acb581cfe (diff)
downloadegit-8a7768c6d9112fbf1258e755ce71b3a98cefa35f.tar.gz
egit-8a7768c6d9112fbf1258e755ce71b3a98cefa35f.tar.xz
egit-8a7768c6d9112fbf1258e755ce71b3a98cefa35f.zip
Merge branch 'stable-5.0'
* stable-5.0: Fix description property in org.eclipse.egit-feature/feature.properties Update license to EPL-2.0 Add tracing of low-level JSch log messages Change-Id: I2bd4012226097efc8826db3396cccd9e423a283d Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit')
-rw-r--r--org.eclipse.egit/about.html40
-rw-r--r--org.eclipse.egit/egit.svg2
-rw-r--r--org.eclipse.egit/plugin.properties6
-rw-r--r--org.eclipse.egit/pom.xml6
4 files changed, 33 insertions, 21 deletions
diff --git a/org.eclipse.egit/about.html b/org.eclipse.egit/about.html
index c0c616c4b..164f781a8 100644
--- a/org.eclipse.egit/about.html
+++ b/org.eclipse.egit/about.html
@@ -2,27 +2,35 @@
"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"/>
+<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>
+ <h2>About This Content</h2>
-<p>June 2, 2006</p>
-<h3>License</h3>
+ <p>November 30, 2017</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 1.0 (&quot;EPL&quot;). A copy of the EPL is available
-at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
+ <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="http://www.eclipse.org/legal/epl-2.0">http://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>
+ <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>
+</html> \ No newline at end of file
diff --git a/org.eclipse.egit/egit.svg b/org.eclipse.egit/egit.svg
index bb2ccdf3e..22b029edb 100644
--- a/org.eclipse.egit/egit.svg
+++ b/org.eclipse.egit/egit.svg
@@ -111,4 +111,4 @@
d="m 400.03658,92.992381 c -20.77969,8.151399 -40.8173,17.817679 -59.95579,28.838399 l 153.29419,152.5442 c -11.58596,27.74412 -6.21332,60.91924 16.375,83.5 7.39212,7.41372 15.89228,13.0214 25,16.75 l 0,273.49999 c -9.10772,3.7286 -17.62844,9.3872 -25,16.75 -29.8242,29.821 -29.8242,78.1334 0,108 29.80256,29.8112 78.17572,29.8112 108,0 29.82424,-29.8666 29.82424,-78.179 0,-108 -6.05812,-6.0407 -12.8598,-10.8994 -20.125,-14.5 l 0,-271.12499 103,103.125 c -11.3756,27.63892 -5.80608,60.54728 16.625,83 29.85896,29.8416 78.15412,29.8416 108,0 29.82424,-29.84052 29.82424,-78.18444 0,-108 -21.35196,-21.38124 -52.14388,-27.33908 -78.875,-18.125 l -110.5,-110.5 c 9.22708,-26.73116 3.22696,-57.51436 -18.125,-78.875 -21.224,-21.22832 -51.74032,-27.24388 -78.375,-18.25 z"
id="path3841"
inkscape:connector-curvature="0"
- sodipodi:nodetypes="ccccccccccccccccccccc" /></svg> \ No newline at end of file
+ sodipodi:nodetypes="ccccccccccccccccccccc" /></svg>
diff --git a/org.eclipse.egit/plugin.properties b/org.eclipse.egit/plugin.properties
index fe88a1114..b00da7e2d 100644
--- a/org.eclipse.egit/plugin.properties
+++ b/org.eclipse.egit/plugin.properties
@@ -2,9 +2,11 @@
# Copyright (c) 2010, Matthias Sohn <matthias.sohn@sap.com>
#
# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
+# 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
###############################################################################
plugin_name=Git integration for Eclipse
provider_name=Eclipse EGit
diff --git a/org.eclipse.egit/pom.xml b/org.eclipse.egit/pom.xml
index 021d59e86..304eda7ae 100644
--- a/org.eclipse.egit/pom.xml
+++ b/org.eclipse.egit/pom.xml
@@ -3,9 +3,11 @@
Copyright (C) 2009, Igor Fedorenko <igor@ifedorenko.com>
All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Public License v1.0
+ 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
-->
<project xmlns="http://maven.apache.org/POM/4.0.0"

Back to the top