Repository: incubator-htrace
Updated Branches:
refs/heads/master 0dcbb2267 -> 97b4fc6f7
HTRACE-80 Add new dependencies to LICENSE
Conflicts:
LICENSE.txt
Project: http://git-wip-us.apache.org/repos/asf/incubator-htrace/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-htrace/commit/97b4fc6f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-htrace/tree/97b4fc6f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-htrace/diff/97b4fc6f
Branch: refs/heads/master
Commit: 97b4fc6f7e7265409da9a7177091236e931cc026
Parents: 0dcbb22
Author: stack <[email protected]>
Authored: Thu Jan 15 11:17:25 2015 -0800
Committer: stack <[email protected]>
Committed: Thu Jan 15 11:19:17 2015 -0800
----------------------------------------------------------------------
LICENSE.txt | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-htrace/blob/97b4fc6f/LICENSE.txt
----------------------------------------------------------------------
diff --git a/LICENSE.txt b/LICENSE.txt
index a2ba0e6..21eb9ce 100644
--- a/LICENSE.txt
+++ b/LICENSE.txt
@@ -226,3 +226,20 @@ Gorilla mux gorilla/mux implements a request router and
dispatcher is BSD licens
godep, a build dependency is Copyright © 2013 Keith Rarick
and portions Copyright (c) 2012 The Go Authors. Its a BSD
license: https://github.com/tools/godep/blob/master/License
+
+underscore, a javascript library of functional programming helpers, is
+(c) 2009-2014 Jeremy Ashkenas, DocumentCloud and Investigative Reporters
+& Editors and an MIT license:
+https://github.com/jashkenas/underscore/blob/master/LICENSE
+
+jquery, a javascript library, is Copyright jQuery Foundation and other
+contributors, https://jquery.org/. The software consists of
+voluntary contributions made by many individuals. For exact
+contribution history, see the revision history
+available at https://github.com/jquery/jquery
+It is MIT licensed:
+https://github.com/jquery/jquery/blob/master/LICENSE.txt
+
+backbone, is a javascript library, that is Copyright (c) 2010-2014
+Jeremy Ashkenas, DocumentCloud. It is MIT licensed:
+https://github.com/jashkenas/backbone/blob/master/LICENSE
