summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Baker <fbaker@hdfgroup.org>2000-06-14 16:23:50 (GMT)
committerFrank Baker <fbaker@hdfgroup.org>2000-06-14 16:23:50 (GMT)
commit1e463da222494289b9b21907a429517ecc5f772f (patch)
tree6c7f40c6a8c5256cd3323a0046cd259e47a20663
parent7b6795cf3d1affb2708b63a5be7554b30ce755b0 (diff)
downloadhdf5-1e463da222494289b9b21907a429517ecc5f772f.zip
hdf5-1e463da222494289b9b21907a429517ecc5f772f.tar.gz
hdf5-1e463da222494289b9b21907a429517ecc5f772f.tar.bz2
[svn-r2387] COPYING: Added LLNL statement. Other minor edits.
-rw-r--r--COPYING34
1 files changed, 33 insertions, 1 deletions
diff --git a/COPYING b/COPYING
index 8e495ef..44e582f 100644
--- a/COPYING
+++ b/COPYING
@@ -3,7 +3,7 @@ Software Library and Utilities
NCSA HDF5 (Hierarchical Data Format 5) Software Library and Utilities
Copyright 1998, 1999, 2000 by the Board of Trustees of the University of
-Illinois. All rights reserved.
+Illinois. All rights reserved.
Contributors: National Center for Supercomputing Applications (NCSA) at the
University of Illinois at Urbana-Champaign (UIUC), Lawrence Livermore
@@ -39,3 +39,35 @@ provided that the following conditions are met:
shall the University or the Contributors be liable for any damages
suffered by the users arising out of the use of this software, even if
advised of the possibility of such damage.
+
+--------------------------------------------------------------------------
+Portions of HDF5 were developed with support from the University of
+California, Lawrence Livermore National Laboratory (UC LLNL).
+The following statement applies to those portions of the product
+and must be retained in any redistribution of source code, binaries,
+documentation, and/or accompanying materials:
+
+ This work was partially produced at the University of California,
+ Lawrence Livermore National Laboratory (UC LLNL) under contract no.
+ W-7405-ENG-48 (Contract 48) between the U.S. Department of Energy
+ (DOE) and The Regents of the University of California (University)
+ for the operation of UC LLNL.
+
+ DISCLAIMER:
+ This work was prepared as an account of work sponsored by an agency
+ of the United States Government. Neither the United States
+ Government nor the University of California nor any of their
+ employees, makes any warranty, express or implied, or assumes any
+ liability or responsibility for the accuracy, completeness, or
+ usefulness of any information, apparatus, product, or process
+ disclosed, or represents that its use would not infringe privately-
+ owned rights. Reference herein to any specific commercial products,
+ process, or service by trade name, trademark, manufacturer, or
+ otherwise, does not necessarily constitute or imply its endorsement,
+ recommendation, or favoring by the United States Government or the
+ University of California. The views and opinions of authors
+ expressed herein do not necessarily state or reflect those of the
+ United States Government or the University of California, and shall
+ not be used for advertising or product endorsement purposes.
+--------------------------------------------------------------------------
+