Skip to content

Commit

Permalink
Merge branch 'release/v0.3.13'
Browse files Browse the repository at this point in the history
  • Loading branch information
@KelSolaar
KelSolaar committed Apr 20, 2019
2 parents 24499f6 + 7144a6d commit 24a8058
Show file tree
Hide file tree
Showing 388 changed files with 6,524 additions and 4,248 deletions.
1,267 changes: 625 additions & 642 deletions BIBLIOGRAPHY.bib
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions CHANGES.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ About

| **Colour** by Colour Developers - 2013-2019
| Copyright © 2013-2019 – Colour Developers – `[email protected] <[email protected]>`_
| This software is released under terms of New BSD License: http://opensource.org/licenses/BSD-3-Clause
| `http://github.com/colour-science/colour <http://github.com/colour-science/colour>`_
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
| `https://github.com/colour-science/colour <https://github.com/colour-science/colour>`_
4 changes: 2 additions & 2 deletions CONTRIBUTING.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ About

| **Colour** by Colour Developers - 2013-2019
| Copyright © 2013-2019 – Colour Developers – `[email protected] <[email protected]>`_
| This software is released under terms of New BSD License: http://opensource.org/licenses/BSD-3-Clause
| `http://github.com/colour-science/colour <http://github.com/colour-science/colour>`_
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
| `https://github.com/colour-science/colour <https://github.com/colour-science/colour>`_
10 changes: 8 additions & 2 deletions CONTRIBUTORS.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ Development & Technical Support

Documentation improvements.

- **Shriramana Sharma**

Documentation improvements.

- **Jean D. Vandenberg**, *Colour Scientist @ The Walt Disney Studios*

Technical support.
Expand Down Expand Up @@ -126,7 +130,9 @@ Issues & Discussions
- @KOLANICH
- @Kunkka1988
- @Legendin
- @leklbk
- @lensz
- @Myndex
- @naavis
- @nschloe
- @peteroupc
Expand All @@ -149,5 +155,5 @@ About

| **Colour** by Colour Developers - 2013-2019
| Copyright © 2013-2019 – Colour Developers – `[email protected] <[email protected]>`_
| This software is released under terms of New BSD License: http://opensource.org/licenses/BSD-3-Clause
| `http://github.com/colour-science/colour <http://github.com/colour-science/colour>`_
| This software is released under terms of New BSD License: https://opensource.org/licenses/BSD-3-Clause
| `https://github.com/colour-science/colour <https://github.com/colour-science/colour>`_
Loading

0 comments on commit 24a8058

Please sign in to comment.