Skip to content
This repository was archived by the owner on Jan 10, 2024. It is now read-only.

Commit

Permalink
Update copyright. (#213)
Browse files Browse the repository at this point in the history
  • Loading branch information
jrood-nrel authored Jan 12, 2022
1 parent 567e714 commit bc9c9af
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 24 deletions.
17 changes: 0 additions & 17 deletions legal.txt

This file was deleted.

18 changes: 11 additions & 7 deletions license.txt
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
PeleLM Copyright (c) 2018, Alliance for Sustainable Energy, LLC.,
through National Renewable Energy Laboratory and the The Regents
PeleLM Copyright (c) 2022, Alliance for Sustainable Energy, LLC.,
through National Renewable Energy Laboratory, the Regents
of the University of California, through Lawrence Berkeley
National Laboratory (subject to receipt of any required approvals
from the U.S. Dept. of Energy). All rights reserved.
National Laboratory, National Technology and Engineering Solutions
of Sandia, LLC, and UT-Battelle, LLC (subject to receipt of any
required approvals from the U.S. Dept. of Energy). All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
Expand All @@ -17,7 +18,8 @@ documentation and/or other materials provided with the distribution.

(3) Neither the name of the University of California, Lawrence
Berkeley National Laboratory, Alliance for Sustainable Energy, LLC.,
National Renewable Energy Laboratory, U.S. Dept. of Energy nor the
National Renewable Energy Laboratory, National Technology and Engineering
Solutions of Sandia LLC, UT-Battelle LLC, U.S. Dept. of Energy, nor the
names of its contributors may be used to endorse or promote products
derived from this software without specific prior written permission.

Expand All @@ -37,8 +39,10 @@ You are under no obligation whatsoever to provide any bug fixes,
patches, or upgrades to the features, functionality or performance of
the source code ("Enhancements") to anyone; however, if you choose to
make your Enhancements available either publicly, or directly to
National Renewable Energy Laboratory or,Lawrence Berkeley National
Laboratory, without imposing a separate written license agreement for
National Renewable Energy Laboratory, Lawrence Berkeley National
Laboratory, National Technology and Engineering Solutions
of Sandia LLC, UT-Battelle LLC, or U.S. Dept. of Energy without
imposing a separate written license agreement for
such Enhancements, then you hereby grant the following license: a
non-exclusive, royalty-free perpetual license to install, use, modify,
prepare derivative works, incorporate into other computer software,
Expand Down

0 comments on commit bc9c9af

Please sign in to comment.