Skip to content

Commit 5eaff19

Browse files
suemninicolasbock
authored andcommitted
Changed LICENSE for Triad
1 parent 3d19108 commit 5eaff19

File tree

1 file changed

+5
-23
lines changed

1 file changed

+5
-23
lines changed

LICENSE.md

+5-23
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
1-
Copyright 2015. Los Alamos National Security, LLC. This software was
2-
produced under U.S. Government contract DE-AC52-06NA25396 for Los
3-
Alamos National Laboratory (LANL), which is operated by Los Alamos
4-
National Security, LLC for the U.S. Department of Energy. The
5-
U.S. Government has rights to use, reproduce, and distribute this
6-
software. NEITHER THE GOVERNMENT NOR LOS ALAMOS NATIONAL SECURITY,
7-
LLC MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY LIABILITY
8-
FOR THE USE OF THIS SOFTWARE. If software is modified to produce
9-
derivative works, such modified software should be clearly marked, so
10-
as not to confuse it with the version available from LANL.
1+
© (or copyright) 2015. Triad National Security, LLC. All rights reserved. This program was produced under U.S. Government contract 89233218CNA000001 for Los Alamos National Laboratory (LANL), which is operated by Triad National Security, LLC for the U.S. Department of Energy/National Nuclear Security Administration.
2+
3+
All rights in the program are reserved by Triad National Security, LLC, and the U.S. Department of Energy/National Nuclear Security Administration. The Government is granted for itself and others acting on its behalf a nonexclusive, paid-up, irrevocable worldwide license in this material to reproduce, prepare derivative works, distribute copies to the public, perform publicly and display publicly, and to permit others to do so.
114

125
Additionally, redistribution and use in source and binary forms, with
136
or without modification, are permitted provided that the following
@@ -17,20 +10,9 @@ conditions are met:
1710
- Redistributions in binary form must reproduce the above copyright
1811
notice, this list of conditions and the following disclaimer in the
1912
documentation and/or other materials provided with the distribution.
20-
- Neither the name of Los Alamos National Security, LLC, Los Alamos
13+
- Neither the name of Triad National Security, LLC, Los Alamos
2114
National Laboratory, LANL, the U.S. Government, nor the names of its
2215
contributors may be used to endorse or promote products derived from
2316
this software without specific prior written permission
2417

25-
THIS SOFTWARE IS PROVIDED BY LOS ALAMOS NATIONAL SECURITY, LLC AND
26-
CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
27-
BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
28-
FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL LOS
29-
ALAMOS NATIONAL SECURITY, LLC OR CONTRIBUTORS BE LIABLE FOR ANY
30-
DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
31-
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
32-
GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
33-
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
34-
IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
35-
OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
36-
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
18+
THIS SOFTWARE IS PROVIDED BY TRIAD NATIONAL SECURITY, LLC AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL TRIAD NATIONAL SECURITY, LLC OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

0 commit comments

Comments
 (0)