Skip to content

Commit

Permalink
New logo and license text. Closes mesonbuild#4921. [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
jpakkane committed Feb 13, 2019
1 parent 25ae7f9 commit 011c77e
Show file tree
Hide file tree
Showing 5 changed files with 311 additions and 58 deletions.
15 changes: 13 additions & 2 deletions docs/markdown/legal.md
Original file line number Diff line number Diff line change
@@ -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].

Expand Down
Binary file modified docs/theme/extra/images/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/theme/extra/images/meson_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 011c77e

Please sign in to comment.