diff --git a/RELICENSING.md b/RELICENSING.md index f920377af3..a8658d729a 100644 --- a/RELICENSING.md +++ b/RELICENSING.md @@ -132,6 +132,11 @@ the Developer Certificate of Origin, version 1.1: - Joseph Goldstone (JGoldstone) - Matthew Levine (melevine) - Yang Yang (yangyangl, but now cometyang) +- Merwan Achibet (merwaaan) +- Anthony Nemoff (ix-anemoff) +- Damien Courtois (ix-dcourtois) +- Carl Rand (crand) +- Gregor Mückl (gmueckl) **Prior authors, please submit a PR against this file that adds your name above. If, at the time of your prior contributions, you were employed by a diff --git a/src/fits.imageio/fits_pvt.cpp b/src/fits.imageio/fits_pvt.cpp index 83de42f5dc..2f3f41c342 100644 --- a/src/fits.imageio/fits_pvt.cpp +++ b/src/fits.imageio/fits_pvt.cpp @@ -1,5 +1,5 @@ // Copyright Contributors to the OpenImageIO project. -// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 // https://github.com/AcademySoftwareFoundation/OpenImageIO #include "fits_pvt.h" diff --git a/src/png.imageio/pnginput.cpp b/src/png.imageio/pnginput.cpp index 32ced7dac0..450bb6ede4 100644 --- a/src/png.imageio/pnginput.cpp +++ b/src/png.imageio/pnginput.cpp @@ -1,5 +1,5 @@ // Copyright Contributors to the OpenImageIO project. -// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 // https://github.com/AcademySoftwareFoundation/OpenImageIO #include diff --git a/src/pnm.imageio/pnminput.cpp b/src/pnm.imageio/pnminput.cpp index cdd51fe31c..5975d3e27a 100644 --- a/src/pnm.imageio/pnminput.cpp +++ b/src/pnm.imageio/pnminput.cpp @@ -1,5 +1,5 @@ // Copyright Contributors to the OpenImageIO project. -// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 // https://github.com/AcademySoftwareFoundation/OpenImageIO #include diff --git a/src/tiff.imageio/tiffinput.cpp b/src/tiff.imageio/tiffinput.cpp index c1e027048f..3c5cbd9834 100644 --- a/src/tiff.imageio/tiffinput.cpp +++ b/src/tiff.imageio/tiffinput.cpp @@ -1,5 +1,5 @@ // Copyright Contributors to the OpenImageIO project. -// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 // https://github.com/AcademySoftwareFoundation/OpenImageIO diff --git a/src/tiff.imageio/tiffoutput.cpp b/src/tiff.imageio/tiffoutput.cpp index 21e05001da..51855aa73c 100644 --- a/src/tiff.imageio/tiffoutput.cpp +++ b/src/tiff.imageio/tiffoutput.cpp @@ -1,5 +1,5 @@ // Copyright Contributors to the OpenImageIO project. -// SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +// SPDX-License-Identifier: Apache-2.0 // https://github.com/AcademySoftwareFoundation/OpenImageIO diff --git a/testsuite/pnm/run.py b/testsuite/pnm/run.py index 49719961de..4fd5a6ed67 100755 --- a/testsuite/pnm/run.py +++ b/testsuite/pnm/run.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # Copyright Contributors to the OpenImageIO project. -# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +# SPDX-License-Identifier: Apache-2.0 # https://github.com/AcademySoftwareFoundation/OpenImageIO imagedir = OIIO_TESTSUITE_IMAGEDIR + "/pnm" diff --git a/testsuite/texture-udim2/run.py b/testsuite/texture-udim2/run.py index 6957d5ed30..368425de05 100755 --- a/testsuite/texture-udim2/run.py +++ b/testsuite/texture-udim2/run.py @@ -1,7 +1,7 @@ #!/usr/bin/env python # Copyright Contributors to the OpenImageIO project. -# SPDX-License-Identifier: BSD-3-Clause and Apache-2.0 +# SPDX-License-Identifier: Apache-2.0 # https://github.com/AcademySoftwareFoundation/OpenImageIO