From ba6ae959b8e21c714c69f66254e82837d45a3ed2 Mon Sep 17 00:00:00 2001
From: mschaefers <mschaefers@scoop-gmbh.de>
Date: Mon, 03 Dec 2012 03:49:23 -0500
Subject: [PATCH] Merge branch 'master' of https://github.com/gitblit/gitblit into enhancedLdap
---
NOTICE | 130 +++++++++++++++++++++++++++++++++++++++++-
1 files changed, 125 insertions(+), 5 deletions(-)
diff --git a/NOTICE b/NOTICE
index d58975a..4daa120 100644
--- a/NOTICE
+++ b/NOTICE
@@ -8,6 +8,14 @@
in this distribution or linked to by this distribution.
---------------------------------------------------------------------------
+Bootstrap
+---------------------------------------------------------------------------
+ Bootstrap, released under the
+ Apache Software License, Version 2.0.
+
+ http://twitter.github.com/bootstrap
+
+---------------------------------------------------------------------------
google-code-prettify
---------------------------------------------------------------------------
google-code-prettify, released under the
@@ -16,12 +24,12 @@
http://code.google.com/p/google-code-prettify
---------------------------------------------------------------------------
-JavaService
+Commons Daemon
---------------------------------------------------------------------------
- JavaService, released under the
- BSD License and the Lesser GNU Public License.
+ Commons Daemon, released under the
+ Apache Software License, Version 2.0.
- http://forge.ow2.org/projects/javaservice
+ http://commons.apache.org/daemon
---------------------------------------------------------------------------
JGit
@@ -64,6 +72,22 @@
http://eclipse.org/jetty
---------------------------------------------------------------------------
+Apache Lucene
+---------------------------------------------------------------------------
+ Apache Lucene, released under the
+ Apache Software License, Version 2.0.
+
+ http://lucene.apache.org
+
+---------------------------------------------------------------------------
+Groovy
+---------------------------------------------------------------------------
+ Groovy, released under the
+ Apache Software License, Version 2.0.
+
+ http://groovy.codehaus.org
+
+---------------------------------------------------------------------------
SLF4J
---------------------------------------------------------------------------
SLF4J, released under the
@@ -96,6 +120,38 @@
http://www.jcraft.com/jsch
---------------------------------------------------------------------------
+Rome
+---------------------------------------------------------------------------
+ Rome RSS and Atom Java Utilities, released under the
+ Apache Software License, Version 1.1.
+
+ http://rome.dev.java.net
+
+---------------------------------------------------------------------------
+jdom
+---------------------------------------------------------------------------
+ jdom xml library, released under the
+ Apache-style Software License.
+
+ http://www.jdom.org
+
+---------------------------------------------------------------------------
+google-gson
+---------------------------------------------------------------------------
+ google-gson, released under the
+ Apache-style Software License.
+
+ http://code.google.com/p/google-gson
+
+---------------------------------------------------------------------------
+javamail
+---------------------------------------------------------------------------
+ javamail, released under multiple licenses
+ CDDL-1.0, BSD, GPL-2.0, GNU-Classpath.
+
+ http://kenai.com/projects/javamail
+
+---------------------------------------------------------------------------
JUnit
---------------------------------------------------------------------------
JUnit, released under the
@@ -103,6 +159,22 @@
http://junit.org
+---------------------------------------------------------------------------
+ant-googlecode
+---------------------------------------------------------------------------
+ ant-googlecode, released under the
+ New BSD License
+
+ http://code.google.com/p/ant-googlecode
+
+---------------------------------------------------------------------------
+GenJar
+---------------------------------------------------------------------------
+ GenJar, released under the
+ Apache Software License, Version 1.1.
+
+ http://genjar.sourceforge.net
+
---------------------------------------------------------------------------
Fancybox image viewer
---------------------------------------------------------------------------
@@ -126,6 +198,14 @@
Creative Commons CC-BY License.
http://henrik.nyh.se/2007/06/alternative-git-logo-and-favicon
+
+---------------------------------------------------------------------------
+Git logo
+---------------------------------------------------------------------------
+ Git logo, released under the
+ Creative Commons Attribution 3.0 Unported License.
+
+ http://git-scm.com/downloads/logos
---------------------------------------------------------------------------
magnifying glass search icon
@@ -134,4 +214,44 @@
Creative Commons CC-BY License.
http://gnome.org
-
\ No newline at end of file
+
+---------------------------------------------------------------------------
+GLYHPICONS
+---------------------------------------------------------------------------
+ GLPYHICONS, released under the
+ Creative Commons CC-BY License.
+
+ http://glyphicons.com
+
+---------------------------------------------------------------------------
+UnboundID
+---------------------------------------------------------------------------
+ UnboundID, released under the
+ GNU LESSER GENERAL PUBLIC LICENSE. (http://www.unboundid.com/products/ldap-sdk/docs/LICENSE-LGPLv2.1.txt)
+
+ http://www.unboundid.com
+
+---------------------------------------------------------------------------
+JCalendar
+---------------------------------------------------------------------------
+ JCalendar, released under the
+ GNU LESSER GENERAL PUBLIC LICENSE. (http://www.unboundid.com/products/ldap-sdk/docs/LICENSE-LGPLv2.1.txt)
+
+ http://www.toedter.com/en/jcalendar
+
+---------------------------------------------------------------------------
+Commons-Compress
+---------------------------------------------------------------------------
+ Commons-Compress, released under the
+ Apache Software License, Version 2.0.
+
+ http://commons.apache.org/compress
+
+---------------------------------------------------------------------------
+XZ for Java
+---------------------------------------------------------------------------
+ XZ for Java, released under the
+ Public Domain
+
+ http://tukaani.org/xz/java.html
+
--
Gitblit v1.9.1