Skip to content

Commit 257f361

Browse files
authored
Merge pull request #51 from r-lib/relicense
- Re-license as MIT (#50).
2 parents 4e4f70c + d0e7853 commit 257f361

File tree

5 files changed

+26
-1
lines changed

5 files changed

+26
-1
lines changed

.Rbuildignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@
2222
^tic\.R$
2323
^tests/testthat/hierarchy/a/b/\.projectile$
2424
^API$
25+
^LICENSE\.md$

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Suggests:
1717
withr,
1818
rmarkdown
1919
VignetteBuilder: knitr
20-
License: GPL-3
20+
License: MIT + file LICENSE
2121
LazyData: true
2222
Encoding: UTF-8
2323
URL: https://github.com/r-lib/rprojroot, https://r-lib.github.io/rprojroot

LICENSE

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
YEAR: 2020
2+
COPYRIGHT HOLDER: rprojroot authors

LICENSE.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# MIT License
2+
3+
Copyright (c) 2020 rprojroot authors
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

NEWS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
- Add `subdir` argument to `make_fix_file()` (#33, @BarkleyBG).
66
- Update documentation for version control criteria (#35, @uribo).
77
- Availability of suggested packages knitr and rmarkdown, and pandoc, is now checked before running the corresponding tests.
8+
- rprojroot has been re-licensed as MIT (#50).
89

910

1011
# rprojroot 1.3-2 (2017-12-22)

0 commit comments

Comments
 (0)