Skip to content

Commit

Permalink
Updates to LICENSE and CONTRIBUTORS.
Browse files Browse the repository at this point in the history
Signed-off-by: Cary Phillips <cary@ilm.com>
  • Loading branch information
cary-ilm committed Jul 26, 2019
1 parent e07ef34 commit 559186e
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 36 deletions.
3 changes: 1 addition & 2 deletions CREDITS.md → CONTRIBUTORS.md
@@ -1,4 +1,4 @@
This is a list of all the contributors to OpenEXR, sorted
This is a list of contributors to the OpenEXR project, sorted
alphabetically by first name.

If you know of missing, please email: info@openexr.com.
Expand Down Expand Up @@ -27,7 +27,6 @@ If you know of missing, please email: info@openexr.com.
* John Loy
* John Mertic
* Jonathan Stone
* JuriAbramov
* Juri Abramov
* Karl Rasche
* Kevin Wheatley
Expand Down
34 changes: 0 additions & 34 deletions LICENSE

This file was deleted.

30 changes: 30 additions & 0 deletions LICENSE.md
@@ -0,0 +1,30 @@
Copyright (c) Contributors to the OpenEXR Project. 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 Industrial Light & Magic nor the names of any
other contributors to this software 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.

0 comments on commit 559186e

Please sign in to comment.