summaryrefslogtreecommitdiffstats
path: root/COPYING
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2021-05-03 18:24:11 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2021-05-03 18:24:11 (GMT)
commita58881550d74626a38c127bff4a7f6a1be03474d (patch)
treeaeb2bb1c58a0fb0a8871dd99347a7cc9e01c9b6d /COPYING
parentc83ca64bd052c58b5f3f3d9afa7a151eefb1776d (diff)
downloadhdf5-a58881550d74626a38c127bff4a7f6a1be03474d.zip
hdf5-a58881550d74626a38c127bff4a7f6a1be03474d.tar.gz
hdf5-a58881550d74626a38c127bff4a7f6a1be03474d.tar.bz2
Update top-level COPYING file and remove COPYING files from subdirectories (#561)
* Modify temporary rpath for testing in java example scripts. * Update URL in source file Copyright headers for web copy of COPYING (license) file. * Add release_docs/code-conventions.md file. * Add script to test h5py. * Fix script error. * Add file h5pytest.yml. * Test declaration of counter variables in for loops. * Committing clang-format changes * Committing clang-format changes * Added [] to line 126 of H5LTanalyze.l. Ran bin/genparser with flex v2.6.4 and Bison v3.0.4 on jelly. * Revert "Added [] to line 126 of H5LTanalyze.l." This reverts commit e4a9cee441efa75b16a8ee030c86189e186dd266. * Revert extra commits to match canonical develop. * Update top-level COPYING file and remove COPYING files from subdirectories. * Remove subdirectory COPYING files from MANIFEST. Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING6
1 files changed, 6 insertions, 0 deletions
diff --git a/COPYING b/COPYING
index da64ef8..9d32232 100644
--- a/COPYING
+++ b/COPYING
@@ -67,6 +67,12 @@ under Prime Contract No. DE-AC02-05CH11231.
-----------------------------------------------------------------------------
+Portions of HDF5 were developed with support from Lawrence Livermore
+National Laboratory and the United States Department of Energy under
+Prime Contract No. DE-AC52-07NA27344.
+
+-----------------------------------------------------------------------------
+
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