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 | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 deletions(-)
diff --git a/NOTICE b/NOTICE
index 6468c49..1417eca 100644
--- a/NOTICE
+++ b/NOTICE
@@ -56,14 +56,6 @@
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
@@ -318,4 +310,35 @@
Apache License 2.0.
http://commons.apache.org/proper/commons-codec
-
\ No newline at end of file
+
+---------------------------------------------------------------------------
+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