Permalink
Browse files

Merge pull request #12522 from tophmatthews/copyright_12521

Updated copyright
  • Loading branch information...
permcody committed Jan 3, 2019
2 parents f865f02 + ac44800 commit f0170c2391fbef3f0b01cd2e5d54f9250a36ee89
Showing with 13 additions and 8 deletions.
  1. +13 −8 COPYRIGHT
@@ -43,11 +43,16 @@ COMPLETENESS, OR USEFULNESS OR ANY INFORMATION, APPARATUS, PRODUCT, OR
PROCESS DISCLOSED, OR REPRESENTS THAT ITS USE WOULD NOT INFRINGE PRIVATELY
OWNED RIGHTS.

© 2017 Los Alamos National Security, LLC
This material was produced under U.S. Government contract DE-AC52-06NA25396
for Los Alamos National Laboratory (LANL), which is operated by
Los Alamos National Security, LLC for the U.S. Department of Energy.
The U.S. Government has rights to use, reproduce, and distribute this software.
NEITHER THE GOVERNMENT NOR LOS ALAMOS NATIONAL SECURITY, LLC
MAKES ANY WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY LIABILITY
FOR THE USE OF THIS SOFTWARE.

© 2017 - 2019 Triad National Security, LLC
ALL RIGHTS RESERVED

This software 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. The U.S. Government has rights to use, reproduce, and distribute
this software. NEITHER THE GOVERNMENT NOR TRIAD NATIONAL SECURITY, LLC MAKES ANY
WARRANTY, EXPRESS OR IMPLIED, OR ASSUMES ANY LIABILITY FOR THE USE OF THIS
SOFTWARE. If software is modified to produce derivative works, such modified
software should be clearly marked, so as not to confuse it with the version
available from LANL.

0 comments on commit f0170c2

Please sign in to comment.