diff options
| author | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-13 18:48:55 +0200 |
|---|---|---|
| committer | Stanislaw Halik <sthalik@misaki.pl> | 2015-10-13 18:48:55 +0200 |
| commit | 5b5261098945d5d9981c9a3b25b1fff3a05aeda7 (patch) | |
| tree | 1265d415d74f6c9253d431e1ebea72d7bcb5d1ae | |
| parent | 3ef631ba91051e5f0c356f51cbdf173a3d2db902 (diff) | |
| parent | 3e60ccda96dfada9307a0a25134475c726f1ae72 (diff) | |
Merge branch 'unstable' into trackhat
* unstable:
added guideline for contributions using LGPL software
Update CONTRIBUTING.md
Update README.md
added guidelines for external contributions
| -rw-r--r-- | CONTRIBUTING.md | 9 | ||||
| -rw-r--r-- | README.md | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..a8e22531 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,9 @@ +# Contributing to opentrack + +Pull requests for contributing patches, improvements and new features are greatly welcome through GitHub. + +By submitting a pull request, you agree to allow the project owner to license your work under the [ISC license](https://opensource.org/licenses/ISC). +Please add your copyright and licensing information before submitting a pull request. + +Contributions may depend on LGPL software but not be a derivative work of LGPL software (and more specifically be statically linked to any LGPL code). +Contributions that are licensed under a copyleft license (such as GPL) cannot be integrated.
\ No newline at end of file @@ -72,6 +72,4 @@ Don't be afraid to submit an issue/feature request if need arises. # Licensing information -Recommended to submit new code under ISC license, shorter boilerplate -header than MIT/X11 or new BSD. Please don't use copyleft licenses for -lack of legal hell. +Almost all code is licensed under the [ISC license](https://en.wikipedia.org/wiki/ISC_license). There are very few proprietary dependencies. There is no copyleft code. See individual files for licensing and authorship information. |