summaryrefslogtreecommitdiffstats
path: root/MANIFEST
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-04-03 14:23:27 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-04-03 14:23:27 (GMT)
commit87e8da66009ca916efb549abc4d456b8fc0f5567 (patch)
tree4b717bf9279a12352e7ed7e30d0c8cf7d87fc8ec /MANIFEST
parent0892bf320cba6e5a3b83db41519a4000c2f5e3c4 (diff)
parent2412158ed8326a3f3d62fbd947e470667d0b5951 (diff)
downloadhdf5-87e8da66009ca916efb549abc4d456b8fc0f5567.zip
hdf5-87e8da66009ca916efb549abc4d456b8fc0f5567.tar.gz
hdf5-87e8da66009ca916efb549abc4d456b8fc0f5567.tar.bz2
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '2412158ed8326a3f3d62fbd947e470667d0b5951': Add new file COPYING_LBNL_HDF5. Revert "Clear hdf5 1.10 entries from RELEASE.txt in the develop branch. Entries" Add LBNL license file and modify COPYING file accordingly. Omnibus checkin for several relatively minor modifications: Clear hdf5 1.10 entries from RELEASE.txt in the develop branch. Entries in this branch version of RELEASE.txt should be intended for the future 1.12.0 release. Fix HDFFV-8089 Description: Some code within an "ifdef H5D_CHUNK_DEBUG" block was using outdated data structure but not caught because the case of H5D_CHUNK_DEBUG being defined was never tested. It was commented out. I defined H5D_CHUNK_DEBUG, tested, and commented out again. Platforms tested: Linux/32 2.6 (jam) Linux/64 (platypus) Darwin (osx1010test)
Diffstat (limited to 'MANIFEST')
-rw-r--r--MANIFEST1
1 files changed, 1 insertions, 0 deletions
diff --git a/MANIFEST b/MANIFEST
index 9400fe3..b312cab 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -26,6 +26,7 @@
./.h5chkright.ini _DO_NOT_DISTRIBUTE_
./ACKNOWLEDGMENTS
./COPYING
+./COPYING_LBNL_HDF5
./MANIFEST
./Makefile.dist
./Makefile.am