Skip to content

docs: Clarify license #3130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Herschel merged 1 commit into from
Feb 10, 2021
Merged

docs: Clarify license #3130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .github/workflows/release_nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,7 @@ jobs:
run: |
mkdir package
cp README.md package/README.md
cp LICENSE_APACHE package/LICENSE_APACHE
cp LICENSE_MIT package/LICENSE_MIT
cp LICENSE.md package/LICENSE.md

- name: Package Windows
if: matrix.os == 'windows-latest'
Expand Down
1,444 changes: 1,444 additions & 0 deletions LICENSE.md
View file
Open in desktop

Large diffs are not rendered by default.

176 changes: 0 additions & 176 deletions LICENSE_APACHE
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions LICENSE_MIT
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion PKGBUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ package() {
cd "$srcdir/"
install -Dm755 -t "$pkgdir/usr/bin/" ruffle
install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname/" README.md
install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" LICENSE_*
install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" LICENSE.md
}
10 changes: 6 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,16 +98,18 @@ Sincere thanks to the diamond level sponsors of Ruffle:

## License

Licensed under either of
Ruffle is licensed under either of

- Apache License, Version 2.0 ([LICENSE_APACHE](LICENSE_APACHE) or http://www.apache.org/licenses/LICENSE-2.0)
- MIT license ([LICENSE_MIT](LICENSE_MIT) or http://opensource.org/licenses/MIT)
- Apache License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0)
- MIT License (http://opensource.org/licenses/MIT)

at your option.

Ruffle depends on third-party libraries under compatible licenses. See [LICENSE.md](LICENSE.md) for full information.

### Contribution

Ruffle welcomes contribution from everyone. See CONTRIBUTING.md for help getting started.
Ruffle welcomes contribution from everyone. See [CONTRIBUTING.md](CONTRIBUTING.md) for help getting started.

Unless you explicitly state otherwise, any contribution intentionally submitted
for inclusion in the work by you shall be dual licensed as above, without any
Expand Down