Skip to content

Commit d58cb5d

Browse files
committed
Merge remote-tracking branch 'origin/master' into dev/2.3
# Conflicts: # README.md # build.gradle
2 parents 5f5eacb + 64d25bf commit d58cb5d

File tree

4 files changed

+450
-263
lines changed

4 files changed

+450
-263
lines changed

CLA.md

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
# Contributor License Agreement (CLA)
2+
3+
**JThumbnail Project**
4+
5+
Thank you for your interest in contributing to **JThumbnail** (“the Project”).
6+
To clarify the intellectual property rights granted with contributions, you agree to the following terms by submitting a contribution (including code, documentation, or other material) to the Project.
7+
8+
9+
## 1. Copyright License
10+
You grant the Project Maintainers a **perpetual, worldwide, non-exclusive, transferable, sublicensable, royalty-free license** to use, reproduce, modify, publicly display, publicly perform, sublicense, and distribute your contributions and derivative works.
11+
12+
13+
## 2. Relicensing Rights
14+
You expressly allow the Project Maintainers to **relicense your contributions under any license of their choosing** in the future, including permissive, copyleft, dual, or commercial licenses.
15+
16+
17+
## 3. Patent License
18+
You grant the Project Maintainers and recipients of the Project a perpetual, worldwide, non-exclusive, royalty-free patent license to make, use, sell, offer for sale, import, and otherwise transfer your contributions.
19+
20+
21+
## 4. Representations and Warranties
22+
By submitting a contribution, you represent that:
23+
- The contribution is your original work, or you have the right to submit it.
24+
- You are legally entitled to grant the above licenses.
25+
- The contribution does not violate any third-party rights.
26+
27+
28+
## 5. Definitions
29+
- **“Contribution”** means any source code, object code, patch, documentation, or other material submitted to the Project.
30+
- **“Project Maintainers”** currently means the copyright holders of JThumbnail and any successors they designate.
31+
32+
## 6. Acceptance
33+
By submitting a contribution to the Project (e.g., via pull request, patch, or other means), you **agree to the terms of this Contributor License Agreement.**

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ While this is a small and focused library, and I'm not actively contributing, yo
66

77
## Guidelines
88

9-
If you do want to contribute, here are a few quick guidelines to follow to keep things clean and consistent:
9+
If you do want to contribute, please read the CLA first, an then here are a few quick guidelines to follow to keep things clean and consistent:
1010

1111
### 1. Keep It Aligned with the Project Scope
1212

0 commit comments

Comments
 (0)