diff options
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/markdown/legal.md | 15 | ||||
| -rw-r--r-- | docs/theme/extra/images/favicon.png | bin | 9637 -> 3970 bytes | |||
| -rw-r--r-- | docs/theme/extra/images/meson_logo.png | bin | 8008 -> 3970 bytes |
3 files changed, 13 insertions, 2 deletions
diff --git a/docs/markdown/legal.md b/docs/markdown/legal.md index 474d129..bd86ff4 100644 --- a/docs/markdown/legal.md +++ b/docs/markdown/legal.md @@ -1,12 +1,23 @@ # Legal information -Meson is copyrighted by all members of the Meson development team. Meson is licensed under the [Apache 2 license]. +Meson is copyrighted by all members of the Meson development team. +Meson is licensed under the [Apache 2 license]. Meson is a registered trademark of Jussi Pakkanen. +## Meson logo licensing + +Meson's logo is (C) Jussi Pakkanen and used by the Meson project with +specific permission. It is not licensed under the same terms as the +rest of the project. + +If you are a third party and want to use the Meson logo, you must +first must obtain written permission from Jussi Pakkanen. + ## Website licensing -The meson website content is released under [Creative Commons Attribution-ShareAlike 4.0 International]. +The meson website content is released under [Creative Commons +Attribution-ShareAlike 4.0 International]. All code samples on the website are released under [CC0 1.0 Universal]. diff --git a/docs/theme/extra/images/favicon.png b/docs/theme/extra/images/favicon.png Binary files differindex 5e7b941..6800fe8 100644 --- a/docs/theme/extra/images/favicon.png +++ b/docs/theme/extra/images/favicon.png diff --git a/docs/theme/extra/images/meson_logo.png b/docs/theme/extra/images/meson_logo.png Binary files differindex 2720af5..6800fe8 100644 --- a/docs/theme/extra/images/meson_logo.png +++ b/docs/theme/extra/images/meson_logo.png |
