From 78dc06a87f82ed19e3eebe1f16dc6c1bdaf5fbc5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 31 Jan 2012 09:35:30 -0500
Subject: [PATCH] Merge pull request #6 from lemval/master
---
NOTICE | 40 ++++++++++++++++++++++++++++++++++++----
1 files changed, 36 insertions(+), 4 deletions(-)
diff --git a/NOTICE b/NOTICE
index bb9aa12..5e49803 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
@@ -112,6 +120,22 @@
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
@@ -126,6 +150,14 @@
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
--
Gitblit v1.9.1