summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Baker <fbaker@hdfgroup.org>2009-04-21 23:09:30 (GMT)
committerFrank Baker <fbaker@hdfgroup.org>2009-04-21 23:09:30 (GMT)
commitabd99a6d512461b32dc3b06bbb5ca0afd9090fc1 (patch)
tree1c9f63432a1bbd4069aad10417515e14b60e63b8
parent91e9a5d5c8970f754ab8b5a77b0573dc34da4076 (diff)
downloadhdf5-abd99a6d512461b32dc3b06bbb5ca0afd9090fc1.zip
hdf5-abd99a6d512461b32dc3b06bbb5ca0afd9090fc1.tar.gz
hdf5-abd99a6d512461b32dc3b06bbb5ca0afd9090fc1.tar.bz2
[svn-r16827] Description:
Updated and restructured "Copyright Notice & License Terms" document per new standard.
-rw-r--r--COPYING18
1 files changed, 11 insertions, 7 deletions
diff --git a/COPYING b/COPYING
index 43c4534..5ba610b 100644
--- a/COPYING
+++ b/COPYING
@@ -11,11 +11,6 @@ Copyright 1998-2006 by the Board of Trustees of the University of Illinois.
All rights reserved.
-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).
-
Redistribution and use in source and binary forms, with or without
modification, are permitted for any purpose (including commercial purposes)
provided that the following conditions are met:
@@ -39,8 +34,8 @@ provided that the following conditions are met:
5. Neither the name of The HDF Group, the name of the University, nor the
name of any Contributor may be used to endorse or promote products derived
- from this software without specific prior written permission from the
- University, The HDF Group, or the Contributor, respectively.
+ from this software without specific prior written permission from
+ The HDF Group, the University, or the Contributor, respectively.
DISCLAIMER:
THIS SOFTWARE IS PROVIDED BY THE HDF GROUP AND THE CONTRIBUTORS
@@ -50,6 +45,15 @@ suffered by the users arising out of the use of this software, even if
advised of the possibility of such damage.
-----------------------------------------------------------------------------
+-----------------------------------------------------------------------------
+
+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 University of
California, Lawrence Livermore National Laboratory (UC LLNL).
The following statement applies to those portions of the product and must