summaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties
diff options
context:
space:
mode:
authorMatthias Sohn <matthias.sohn@sap.com>2014-04-13 23:27:45 +0200
committerMatthias Sohn <matthias.sohn@sap.com>2014-04-14 01:12:40 +0200
commit1f83fe8545408e89faa1122e56a3358414d6d13d (patch)
tree95d634280e91ceb5b9d0583cd12dcd7de6001aa3 /org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties
parent6654baddae0e503531c208084c43ceb380bd402a (diff)
downloadjgit-1f83fe8545408e89faa1122e56a3358414d6d13d.tar.gz
jgit-1f83fe8545408e89faa1122e56a3358414d6d13d.zip
Update Software User Agreement
Bug: 431255 Change-Id: I8a44028d8c48ddd1b9d2f9ef4af4d417c5454881
Diffstat (limited to 'org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties')
-rw-r--r--org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties5
1 files changed, 2 insertions, 3 deletions
diff --git a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties
index 44112e878d..369e307d1a 100644
--- a/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties
+++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.feature/feature.properties
@@ -35,7 +35,7 @@ licenseURL=license.html
# should be plain text version of license agreement pointed to be "licenseURL"
license=\
Eclipse Foundation Software User Agreement\n\
-February 1, 2011\n\
+April 9, 2014\n\
\n\
Usage Of Content\n\
\n\
@@ -108,7 +108,6 @@ SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
- Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
- Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
- Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
- - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
- 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\n\
@@ -157,4 +156,4 @@ regulations and policies concerning the import, possession, or use, and\n\
re-export of encryption software, to see if this is permitted.\n\
\n\
Java and all Java-based trademarks are trademarks of Oracle Corporation in the United States, other countries, or both.\n
-########### end of license property ##########################################
+########### end of license property ########################################## \ No newline at end of file