diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2011-06-09 17:41:16 +0200 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2011-06-09 17:41:16 +0200 |
commit | 0ab7be9681912ef5d11fe10af1f7536c2feaa662 (patch) | |
tree | b6d08406f75c79834e6225c23eec4f3730cad871 /org.eclipse.jgit.ui | |
parent | f1713abcdcb5097d4e44893862bedc6e27dde20e (diff) | |
parent | 6646c72d1723d5c01d68a0d02e0eb26c90bdd345 (diff) | |
download | jgit-0ab7be9681912ef5d11fe10af1f7536c2feaa662.tar.gz jgit-0ab7be9681912ef5d11fe10af1f7536c2feaa662.zip |
Merge branch 'stable-1.0'
* stable-1.0:
Prepare post JGit v1.0.0.201106090707-r builds
JGit v1.0.0.201106090707-r
Include about.html files in maven build
Prepare post v1.0.0.201106081625-r builds
JGit v1.0.0.201106081625-r
Add missing about.html files to all shipped bundles
Prepare post v1.0.0.201106071701-r builds
JGit v1.0.0.201106071701-r
Diffstat (limited to 'org.eclipse.jgit.ui')
-rw-r--r-- | org.eclipse.jgit.ui/about.html | 59 | ||||
-rw-r--r-- | org.eclipse.jgit.ui/build.properties | 3 | ||||
-rw-r--r-- | org.eclipse.jgit.ui/pom.xml | 1 |
3 files changed, 62 insertions, 1 deletions
diff --git a/org.eclipse.jgit.ui/about.html b/org.eclipse.jgit.ui/about.html new file mode 100644 index 0000000000..01a2671875 --- /dev/null +++ b/org.eclipse.jgit.ui/about.html @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="ISO-8859-1" ?> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + +<head> +<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1" /> +<title>Eclipse Distribution License - Version 1.0</title> +<style type="text/css"> + body { + size: 8.5in 11.0in; + margin: 0.25in 0.5in 0.25in 0.5in; + tab-interval: 0.5in; + } + p { + margin-left: auto; + margin-top: 0.5em; + margin-bottom: 0.5em; + } + p.list { + margin-left: 0.5in; + margin-top: 0.05em; + margin-bottom: 0.05em; + } + </style> + +</head> + +<body lang="EN-US"> + +<p><b>Eclipse Distribution License - v 1.0</b></p> + +<p>Copyright (c) 2007, Eclipse Foundation, Inc. and its licensors. </p> + +<p>All rights reserved.</p> +<p>Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: +<ul><li>Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. </li> +<li>Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. </li> +<li>Neither the name of the Eclipse Foundation, Inc. nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. </li></ul> +</p> +<p>THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, +INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR +PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE.</p> + +</body> + +</html> diff --git a/org.eclipse.jgit.ui/build.properties b/org.eclipse.jgit.ui/build.properties index 84f1c95cfa..8148271ef3 100644 --- a/org.eclipse.jgit.ui/build.properties +++ b/org.eclipse.jgit.ui/build.properties @@ -3,4 +3,5 @@ source.. = src/,\ output.. = bin/ bin.includes = META-INF/,\ .,\ - plugin.properties + plugin.properties,\ + about.html diff --git a/org.eclipse.jgit.ui/pom.xml b/org.eclipse.jgit.ui/pom.xml index 0d983dd7e9..21da44a41c 100644 --- a/org.eclipse.jgit.ui/pom.xml +++ b/org.eclipse.jgit.ui/pom.xml @@ -82,6 +82,7 @@ <directory>.</directory> <includes> <include>plugin.properties</include> + <include>about.html</include> </includes> </resource> <resource> |