Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-21 19:42:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix other occurrences of #34 (#48)

Browse Source
This commit is contained in:
Robin B 2019-03-06 18:55:06 +01:00 committed by Christopher Tubbs
parent 090f94947e
commit 177245b7d5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CONTRIBUTING.md
View File

@ -18,7 +18,7 @@ there are many ways you can contribute. For example, you can:
## Legal ## Legal
The project maintainer for this project will only accept contributions using the [Developer's Certificate of Origin 1.1][dco] located at https://developercertificate.org ("DCO"). The project maintainer for this project will only accept contributions using the [Developer's Certificate of Origin 1.1][dco] located at https://developercertificate.org ("DCO").
The DCO is a legally binding statement asserting that the contributor is the creator of the contribution, or otherwise has the authority to distribute the contribution, and that they are intentionally making the contribution available under the license(s) associated with the Project ("License"). The DCO is a legally binding statement asserting that the contributor is the creator of the contribution, or otherwise has the authority to distribute the contribution, and that they are intentionally making the contribution available under the license(s) associated with the project ("License").
This is an open source project. This is an open source project.
Contributions you make to this public U.S. Government ("USG") repository are completely voluntary. Contributions you make to this public U.S. Government ("USG") repository are completely voluntary.
@ -37,11 +37,11 @@ To indicate you have read and agree to the DCO, you need to add the following in
This essentially affirms that you have the right to submit the work you are contributing in your pull requests and that you consent to us treating the contribution in a way consistent with the License. This essentially affirms that you have the right to submit the work you are contributing in your pull requests and that you consent to us treating the contribution in a way consistent with the License.
Please see the [licensing intent][intent] for details. Please see the [licensing intent][intent] for details.
The primary License for this Project is the Apache License, Version 2.0 ("Apache 2.0"). The primary License for this project is the Apache License, Version 2.0 ("Apache 2.0").
The project composes a number of software modules with documentation ("Modules"). The project composes a number of software modules with documentation ("Modules").
Each module may have additional licensing restrictions imposed by its dependencies, or because some portion of it was derived from software requiring the application of these restrictions. Each module may have additional licensing restrictions imposed by its dependencies, or because some portion of it was derived from software requiring the application of these restrictions.
In most cases, these licenses do not introduce any restrictions beyond those already required by Apache 2.0, e.g., BSD-style licenses. In most cases, these licenses do not introduce any restrictions beyond those already required by Apache 2.0, e.g., BSD-style licenses.
In general, we intend to indicate within each Module the applicable license(s), whether or not they are more restrictive than the Project's License. In general, we intend to indicate within each Module the applicable license(s), whether or not they are more restrictive than the project's License.
When you sign the DCO and submit a pull request containing contributions to such a module, please keep in mind you are asserting you have the authority to submit the work, and that the work will be made available under those license(s). When you sign the DCO and submit a pull request containing contributions to such a module, please keep in mind you are asserting you have the authority to submit the work, and that the work will be made available under those license(s).
### Important Points ### Important Points