You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2015/07/22 14:08:53 UTC

[03/23] incubator-usergrid git commit: Add line about jQuery Sparklines.

Add line about jQuery Sparklines.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/6746b59e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/6746b59e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/6746b59e

Branch: refs/heads/two-dot-o
Commit: 6746b59eb8d3e8bf5ee143a66defd3f80849a8a7
Parents: 5bdea9c
Author: Dave Johnson <dm...@apigee.com>
Authored: Fri Jun 26 12:46:32 2015 -0400
Committer: Dave Johnson <dm...@apigee.com>
Committed: Fri Jun 26 12:46:32 2015 -0400

----------------------------------------------------------------------
 LICENSE | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/6746b59e/LICENSE
----------------------------------------------------------------------
diff --git a/LICENSE b/LICENSE
index dd22519..7eab63d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -270,45 +270,48 @@ For the SSKeychain component:
 Other components:
 -----------------
 
-This product bundles SBJson, which is available under a "3-clause BSD" license.
-For details, see sdks/ios/UGAPI/SBJson/ .
-
-This product bundles SSKeychain, which is available under a "MIT/X11" license.
-For details, see sdks/ios/UGAPI/SSKeychain/.
+This product bundles angular.js
+Copyright(c) Google, Inc. Released under the MIT license.
 
 This product bundles angular-scenario.js, part of jQuery JavaScript Library
 which Includes Sizzle.js Copyright (c) jQuery Foundation, Inc. and others.
 Released under the MIT license.
 
-This product bundles angular.js
-Copyright(c) Google, Inc. Released under the MIT license.
-
 This product bundles Bootstrap Copyright (c) Twitter, Inc
 Licensed under the MIT license.
 
-This product bundles jquery-ui
+The product bundles Intro.js (MIT licensed)
+Copyright (c) usabli.ca - A weekend project by Afshin Mehrabani (@afshinmeh)
+
+This product bundles jQuery
 Licensed under MIT license.
 
-This product bundles jquery
+This product bundles jQuery-UI
 Licensed under MIT license.
 
-This product bundles mocha. 
+This product bundles jQuery Sparklines (New BSD License)
+Copyright (c) Splunk Inc.
+
+This product bundles Mocha. 
 All rights reserved. Licensed under MIT.
 Copyright (c) TJ Holowaychuk <tj...@vision-media.ca>
 
-This product bundles SSToolkit.
-Copyright (c) Sam Soffes. All rights reserved.
-These files can be located within the /sdks/ios package.
-
-The product bundles Intro.js (MIT licensed)
-Copyright (c) usabli.ca - A weekend project by Afshin Mehrabani (@afshinmeh)
+This product bundles NewtonSoft.Json under MIT license 
 
 This product bundles NPM MD5 (BSD-3 licensed)
 Copyright (c) Paul Vorbach and Copyright (C), Jeff Mott.
 
-This product bundles NewtonSoft.Json under MIT license 
-
 This product bundles NSubsttute under BSD license 
 
+This product bundles SBJson, which is available under a "3-clause BSD" license.
+For details, see sdks/ios/UGAPI/SBJson/ .
+
 This product bundles Sphinx under BSD license 
 
+This product bundles SSKeychain, which is available under a "MIT/X11" license.
+For details, see sdks/ios/UGAPI/SSKeychain/.
+
+This product bundles SSToolkit.
+Copyright (c) Sam Soffes. All rights reserved.
+These files can be located within the /sdks/ios package.
+