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 2014/08/20 18:41:09 UTC
[2/2] git commit: Merge branch 'pr/55'
Merge branch 'pr/55'
Conflicts:
NOTICE
Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/bfc6f551
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/bfc6f551
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/bfc6f551
Branch: refs/heads/master
Commit: bfc6f551a15898375f4d5e11eac4ff40476eed03
Parents: 3bf7bc1 5c6802f
Author: Dave Johnson <sn...@apache.org>
Authored: Wed Aug 20 12:40:55 2014 -0400
Committer: Dave Johnson <sn...@apache.org>
Committed: Wed Aug 20 12:40:55 2014 -0400
----------------------------------------------------------------------
NOTICE | 33 ++++++++++++++++++++
.../samples/Books/books/AddBookViewController.h | 14 +++++++++
sdks/ios/samples/Books/books/AppDelegate.h | 14 +++++++++
.../samples/Books/books/BooksViewController.h | 14 +++++++++
.../Books/books/UGSignInViewController.h | 14 +++++++++
.../ios/samples/Browser/browser/UGAppDelegate.h | 14 +++++++++
.../Browser/browser/UGAppViewController.h | 14 +++++++++
.../browser/UGCollectionViewController.h | 14 +++++++++
.../Browser/browser/UGEntityViewController.h | 14 +++++++++
.../Browser/browser/UGSignInViewController.h | 14 +++++++++
.../Browser/browser/UGTextViewController.h | 14 +++++++++
sdks/ios/samples/parties/parties/AppDelegate.h | 14 ++++++++-
.../parties/parties/PartiesViewController.h | 14 ++++++++-
.../parties/parties/PartyViewController.h | 14 ++++++++-
14 files changed, 212 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/bfc6f551/NOTICE
----------------------------------------------------------------------
diff --cc NOTICE
index 65d87c2,3b4c11e..45ddf8f
--- a/NOTICE
+++ b/NOTICE
@@@ -20,15 -20,42 +20,48 @@@ Google, Inc. Released under the MIT lic
This product bundles Bootstrap v2.3.2 Copyright 2012 Twitter, Inc
Licensed under the Apache License v2.0
-This product bundles with jquery-ui-1.8.9. Licensed under MIT license.
+This product bundles jquery-ui-1.8.9. Licensed under MIT license.
-This product bundles with mocha.
-All rights reserved. Licensed under MIT.
+This product bundles jquery-1.9.1 Licensed under MIT license.
+
+This product bundles mocha. All rights reserved. Licensed under MIT.
Copyright (c) 2011-2014 TJ Holowaychuk <tj...@vision-media.ca>
+This product bundles NSubstitute v1.6.0.0. Licensed under the BSD 2-Clause License.
+
+This product bundles NUnit v2.6.2.
+Portions Copyright © 2002-2012 Charlie Poole or Copyright © 2002-2004 James W. Newkirk, Michael C. Two, Alexei A. Vorontsov or Copyright © 2000-2002 Philip A. Craig
+
+ This product bundles a number of files within the /sdks/ios
+ package.
+
+ Copyright (C) 2009 Stig Brautaset. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+ * Neither the name of the author nor the names of its contributors may be used
+ to endorse or promote products derived from this software without specific
+ prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
+ FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+ This product bundles SSToolkit Copyright (c) 2009-2011 Sam Soffes. All rights reserved.
+ These files can be located within the /sdks/ios package.
+