From f66e89662c091e082bd1d2feb6ac91513ccff273 Mon Sep 17 00:00:00 2001
From: Rafael Cavazin <rafaelcavazin@gmail.com>
Date: Sun, 21 Jul 2013 09:59:00 -0400
Subject: [PATCH] Merge branch 'master' of https://github.com/gitblit/gitblit
---
NOTICE | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 48 insertions(+), 0 deletions(-)
diff --git a/NOTICE b/NOTICE
index 4daa120..9bd356a 100644
--- a/NOTICE
+++ b/NOTICE
@@ -255,3 +255,51 @@
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
+
\ No newline at end of file
--
Gitblit v1.9.1