summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM. Scot Breitenfeld <brtnfld@hdfgroup.org>2017-10-26 20:23:48 (GMT)
committerM. Scot Breitenfeld <brtnfld@hdfgroup.org>2017-10-26 20:23:48 (GMT)
commita3e40025729fd8c3b2f0488d6745f579eb29c5db (patch)
tree4ec21d284e91ee5c40ac78f00943f95132041417
parent85531beb2afc266b203eeeeb205f7bc95cdcc9b2 (diff)
downloadhdf5-a3e40025729fd8c3b2f0488d6745f579eb29c5db.zip
hdf5-a3e40025729fd8c3b2f0488d6745f579eb29c5db.tar.gz
hdf5-a3e40025729fd8c3b2f0488d6745f579eb29c5db.tar.bz2
manual fix from merge with develop
-rw-r--r--COPYING2
-rw-r--r--src/H5PL.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/COPYING b/COPYING
index 90aa75a..c668565 100644
--- a/COPYING
+++ b/COPYING
@@ -49,7 +49,7 @@ 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
-https://support.hdfgroup.org/ftp/HDF5/releases/COPYING_LBNL_HDF5.
+http://support.hdfgroup.org/ftp/HDF5/releases/COPYING_LBNL_HDF5.
-----------------------------------------------------------------------------
-----------------------------------------------------------------------------
diff --git a/src/H5PL.c b/src/H5PL.c
index bd02bf3..fc42554 100644
--- a/src/H5PL.c
+++ b/src/H5PL.c
@@ -54,6 +54,7 @@
/* Local Variables */
/*******************/
+
/*-------------------------------------------------------------------------
* Function: H5PLset_loading_state