From 011c77ee22f600548bffaf94e67608b31a3722c8 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Wed, 13 Feb 2019 18:32:04 +0200 Subject: New logo and license text. Closes #4921. [skip ci] --- docs/markdown/legal.md | 15 +++++++++++++-- docs/theme/extra/images/favicon.png | Bin 9637 -> 3970 bytes docs/theme/extra/images/meson_logo.png | Bin 8008 -> 3970 bytes 3 files changed, 13 insertions(+), 2 deletions(-) (limited to 'docs') 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 index 5e7b941..6800fe8 100644 Binary files a/docs/theme/extra/images/favicon.png and b/docs/theme/extra/images/favicon.png differ diff --git a/docs/theme/extra/images/meson_logo.png b/docs/theme/extra/images/meson_logo.png index 2720af5..6800fe8 100644 Binary files a/docs/theme/extra/images/meson_logo.png and b/docs/theme/extra/images/meson_logo.png differ -- cgit v1.1