diff options
author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-07-23 13:58:00 (GMT) |
---|---|---|
committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-07-23 13:58:00 (GMT) |
commit | e3964f7c160879000bebb27b1845a157f117265d (patch) | |
tree | 20e74f4794bd3cd54fbab343fd6aab5d3a4e7bff /src/H5D.c | |
parent | a487ca20d961937e39f7f46b183f1be1c33022d4 (diff) | |
parent | 1ebce1bfcf419ff6d0bf4cea2735cffb26b7a787 (diff) | |
download | hdf5-e3964f7c160879000bebb27b1845a157f117265d.zip hdf5-e3964f7c160879000bebb27b1845a157f117265d.tar.gz hdf5-e3964f7c160879000bebb27b1845a157f117265d.tar.bz2 |
[svn-r25471] merge from trunk and resolve conflicts.
Diffstat (limited to 'src/H5D.c')
-rw-r--r-- | src/H5D.c | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -652,7 +652,6 @@ H5Dget_access_plist(hid_t dset_id) HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get dataset access properties") done: - FUNC_LEAVE_API(ret_value) } /* end H5Dget_access_plist() */ |