Skip to content

Commit

Permalink
Fix license and copyright
Browse files Browse the repository at this point in the history
  • Loading branch information
kriskowal committed Jul 29, 2014
1 parent 1f0889b commit 3fac19b
Showing 1 changed file with 7 additions and 15 deletions.
22 changes: 7 additions & 15 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,8 @@
Copyright (c) 2012, Kris Kowal.
BSD 3-Clause License
3-clause BSD license
====================

Includes TJ Holowaychuk’s QueryString parser.
Copyright and license not disclosed.

Includes Kris Kowal’s Q promise library.
MIT License

Based on Motorola Mobility’s Montage
Copyright (c) 2012, Motorola Mobility LLC.
All Rights Reserved.
Copyright 2012-2014 Motorola Mobility LLC, Montage Studio Inc, and contributors.
All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
Expand All @@ -21,9 +14,9 @@ modification, are permitted provided that the following conditions are met:
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.

* Neither the name of Motorola Mobility LLC nor the names of its
contributors may be used to endorse or promote products derived from this
software without specific prior written permission.
* Neither the name of Motorola Mobility LLC, Montage Studio, Montage 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
Expand All @@ -36,4 +29,3 @@ 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.

0 comments on commit 3fac19b

Please sign in to comment.