summaryrefslogtreecommitdiffstats
path: root/COPYING
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2017-04-11 15:40:00 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2017-04-11 15:40:00 (GMT)
commitda4b69097756158fdbfcbf52b5b552e2034d263d (patch)
tree51d646d6a737c1e4216f04b9c9fa16a0afc49277 /COPYING
parenta77bf61074122d4e6a100c09f23a684cd9655ff8 (diff)
parentccb4e9ed9a5e0af27db9f1504a628e35d7f4cf92 (diff)
downloadhdf5-da4b69097756158fdbfcbf52b5b552e2034d263d.zip
hdf5-da4b69097756158fdbfcbf52b5b552e2034d263d.tar.gz
hdf5-da4b69097756158fdbfcbf52b5b552e2034d263d.tar.bz2
Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into merge_hyperslab_updates
Diffstat (limited to 'COPYING')
-rw-r--r--COPYING15
1 files changed, 11 insertions, 4 deletions
diff --git a/COPYING b/COPYING
index 2166ced..51cb4e6 100644
--- a/COPYING
+++ b/COPYING
@@ -1,13 +1,12 @@
-
Copyright Notice and License Terms for
HDF5 (Hierarchical Data Format 5) Software Library and Utilities
-----------------------------------------------------------------------------
HDF5 (Hierarchical Data Format 5) Software Library and Utilities
-Copyright 2006-2016 by The HDF Group.
+Copyright (c) 2006, The HDF Group.
NCSA HDF5 (Hierarchical Data Format 5) Software Library and Utilities
-Copyright 1998-2006 by the Board of Trustees of the University of Illinois.
+Copyright (c) 1998-2006, The Board of Trustees of the University of Illinois.
All rights reserved.
@@ -47,13 +46,21 @@ advised of the possibility of such damage.
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
+Limited portions of HDF5 were developed by Lawrence Berkeley National
+Laboratory (LBNL). LBNL's Copyright Notice and Licensing Terms can be
+found here: COPYING_LBNL_HDF5 file in this directory or at
+http://support.hdfgroup.org/ftp/HDF5/releases/COPYING_LBNL_HDF5.
+
+-----------------------------------------------------------------------------
+-----------------------------------------------------------------------------
+
Contributors: National Center for Supercomputing Applications (NCSA) at
the University of Illinois, Fortner Software, Unidata Program Center (netCDF),
The Independent JPEG Group (JPEG), Jean-loup Gailly and Mark Adler (gzip),
and Digital Equipment Corporation (DEC).
-----------------------------------------------------------------------------
-
+
Portions of HDF5 were developed with support from the Lawrence Berkeley
National Laboratory (LBNL) and the United States Department of Energy
under Prime Contract No. DE-AC02-05CH11231.