Skip to content

Commit

Permalink
Merge pull request #51 from r-lib/relicense
Browse files Browse the repository at this point in the history
- Re-license as MIT (#50).
  • Loading branch information
krlmlr committed Nov 8, 2020
2 parents 4e4f70c + d0e7853 commit 257f361
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 1 deletion.
1 change: 1 addition & 0 deletions .Rbuildignore
Expand Up @@ -22,3 +22,4 @@
^tic\.R$
^tests/testthat/hierarchy/a/b/\.projectile$
^API$
^LICENSE\.md$
2 changes: 1 addition & 1 deletion DESCRIPTION
Expand Up @@ -17,7 +17,7 @@ Suggests:
withr,
rmarkdown
VignetteBuilder: knitr
License: GPL-3
License: MIT + file LICENSE
LazyData: true
Encoding: UTF-8
URL: https://github.com/r-lib/rprojroot, https://r-lib.github.io/rprojroot
Expand Down
2 changes: 2 additions & 0 deletions LICENSE
@@ -0,0 +1,2 @@
YEAR: 2020
COPYRIGHT HOLDER: rprojroot authors
21 changes: 21 additions & 0 deletions LICENSE.md
@@ -0,0 +1,21 @@
# MIT License

Copyright (c) 2020 rprojroot authors

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
1 change: 1 addition & 0 deletions NEWS.md
Expand Up @@ -5,6 +5,7 @@
- Add `subdir` argument to `make_fix_file()` (#33, @BarkleyBG).
- Update documentation for version control criteria (#35, @uribo).
- Availability of suggested packages knitr and rmarkdown, and pandoc, is now checked before running the corresponding tests.
- rprojroot has been re-licensed as MIT (#50).


# rprojroot 1.3-2 (2017-12-22)
Expand Down

0 comments on commit 257f361

Please sign in to comment.