diff options
| author | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2019-01-02 19:23:54 (GMT) |
|---|---|---|
| committer | Vailin Choi <vchoi@jam.ad.hdfgroup.org> | 2019-01-02 19:23:54 (GMT) |
| commit | d3dff6efe6f769b219f9dcccebd057afe75ed3c7 (patch) | |
| tree | a4b0146909d9468a0a44921bd2e3a494d9cdb77e /configure.ac | |
| parent | 7f9c45999567ca5f1db89127cf101a9fae27aba1 (diff) | |
| parent | 71f4e1832c737e2fb76385bc478fad7f39d89ab8 (diff) | |
| download | hdf5-d3dff6efe6f769b219f9dcccebd057afe75ed3c7.zip hdf5-d3dff6efe6f769b219f9dcccebd057afe75ed3c7.tar.gz hdf5-d3dff6efe6f769b219f9dcccebd057afe75ed3c7.tar.bz2 | |
Merge branch 'develop' of https://bitbucket.hdfgroup.org/scm/hdffv/hdf5 into develop
Resolve conflicts:
Conflicts:
test/Makefile.am
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 3459b23..21ad68b 100644 --- a/configure.ac +++ b/configure.ac @@ -3409,7 +3409,9 @@ AC_CONFIG_FILES([src/libhdf5.settings test/testvdsswmr.sh test/test_filter_plugin.sh test/test_usecases.sh + test/test_vol_plugin.sh testpar/Makefile + testpar/testpflush.sh tools/Makefile tools/lib/Makefile tools/src/Makefile |