docs(license): update to dual license

c932f96f · hannahhoward · faf1a196 · c932f96f · c932f96f · c932f96f
Commit c932f96f authored Mar 20, 2019 by hannahhoward
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 7 deletions

COPYRIGHT COPYRIGHT +3 -0

LICENSE-APACHE LICENSE-APACHE +13 -0

LICENSE-MIT LICENSE-MIT +5 -7

No files found.
--- a/COPYRIGHT
+++ b/COPYRIGHT
+Copyright 2019. Protocol Labs, Inc.
+
+This library is dual-licensed under Apache 2.0 and MIT terms.
--- a/LICENSE-APACHE
+++ b/LICENSE-APACHE
+Copyright 2019. Protocol Labs, Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
--- a/LICENSE
+++ b/LICENSE
-The MIT License (MIT)
-
-Copyright (c) 2014-2018 Juan Batiz-Benet
+Copyright 2019. Protocol Labs, Inc.

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -9,13 +7,13 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
 copies of the Software, and to permit persons to whom the Software is
 furnished to do so, subject to the following conditions:

-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.

 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.