From fcc9367bc9d05580ada72b8e9253fd67c8b3260c Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 05 Mar 2014 11:31:08 -0500
Subject: [PATCH] Merge pull request #144 from ds5apn/master
---
NOTICE | 177 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 168 insertions(+), 9 deletions(-)
diff --git a/NOTICE b/NOTICE
index 41b61f1..1417eca 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
@@ -48,20 +56,28 @@
https://github.com/wicketstuff/core/wiki/GoogleCharts
---------------------------------------------------------------------------
-MarkdownPapers
----------------------------------------------------------------------------
- MarkdownPapers, released under the
- Apache Software License, Version 2.0.
-
- http://markdown.tautua.org
-
----------------------------------------------------------------------------
Jetty
---------------------------------------------------------------------------
Jetty, released under the
Apache Software License, Version 2.0.
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
@@ -174,6 +190,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
@@ -182,4 +206,139 @@
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
+
+---------------------------------------------------------------------------
+Iconic
+---------------------------------------------------------------------------
+ Iconic, release under the
+ Creative Commons Share Alike 3.0 License.
+
+ http://somerandomdude.com/work/iconic
+
+---------------------------------------------------------------------------
+AngularJS
+---------------------------------------------------------------------------
+ AngularJS, release under the
+ MIT License.
+
+ http://angularjs.org/
+
+---------------------------------------------------------------------------
+FreeMarker
+---------------------------------------------------------------------------
+ FreeMarker, release under a
+ modified BSD License. (http://www.freemarker.org/docs/app_license.html)
+
+ http://www.freemarker.org/
+
+---------------------------------------------------------------------------
+Waffle
+---------------------------------------------------------------------------
+ Waffle, release under the
+ Eclipse Public License, version 1.0
+
+ http://dblock.github.io/waffle
+
+---------------------------------------------------------------------------
+JNA
+---------------------------------------------------------------------------
+ JNA, release under the
+ Lesser GNU Public License, version 2.1
+
+ https://github.com/twall/jna
+
+---------------------------------------------------------------------------
+Guava
+---------------------------------------------------------------------------
+ Guava, release under the
+ Apache License 2.0.
+
+ https://code.google.com/p/guava-libraries
+
+---------------------------------------------------------------------------
+libpam4j
+---------------------------------------------------------------------------
+ libpam4j, release under the
+ MIT license.
+
+ https://github.com/kohsuke/libpam4j
+
+---------------------------------------------------------------------------
+commons-codec
+---------------------------------------------------------------------------
+ commons-codec, release under the
+ Apache License 2.0.
+
+ http://commons.apache.org/proper/commons-codec
+
+---------------------------------------------------------------------------
+pegdown
+---------------------------------------------------------------------------
+ pegdown, release under the
+ Apache License 2.0.
+
+ https://github.com/sirthias/pegdown
+
+---------------------------------------------------------------------------
+font-awesome
+---------------------------------------------------------------------------
+ font-awesome, release under the
+ SIL OFL 1.1.
+
+ https://github.com/FortAwesome/Font-Awesome
+
+---------------------------------------------------------------------------
+AUI (excerpts)
+---------------------------------------------------------------------------
+ AUI, release under the
+ Apache License 2.0
+
+ https://bitbucket.org/atlassian/aui
+
+---------------------------------------------------------------------------
+Jedis
+---------------------------------------------------------------------------
+ Jedis, release under the
+ MIT license
+
+ https://github.com/xetorthio/jedis
--
Gitblit v1.9.1