diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-06-27 15:44:50 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2013-06-27 15:44:50 (GMT) |
| commit | 0fe43fbf2cd56f142ec322daca2a669fac8243ed (patch) | |
| tree | f01427e9de3133b822475e1aeb3c73ad21a4ec1f /MANIFEST | |
| parent | 7320a66aa7224549c308132a796cef325d377116 (diff) | |
| parent | a4dc3ff34d2dec4db339851df381b67970853f2a (diff) | |
| download | hdf5-0fe43fbf2cd56f142ec322daca2a669fac8243ed.zip hdf5-0fe43fbf2cd56f142ec322daca2a669fac8243ed.tar.gz hdf5-0fe43fbf2cd56f142ec322daca2a669fac8243ed.tar.bz2 | |
[svn-r23834] merge from trunk up to r23833.
Fixed several conflicts, mostly because calling API routines internally was removed from several places in the trunk.
Diffstat (limited to 'MANIFEST')
| -rw-r--r-- | MANIFEST | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -1520,6 +1520,8 @@ ./tools/testfiles/topaque.h5 ./tools/testfiles/trawdatafile.ddl ./tools/testfiles/trawdatafile.exp +./tools/testfiles/trawssetfile.ddl +./tools/testfiles/trawssetfile.exp ./tools/testfiles/tsaf.ddl ./tools/testfiles/tsaf.h5 ./tools/testfiles/tscalarattrintsize.ddl @@ -1560,6 +1562,7 @@ ./tools/testfiles/tudlink-2.ddl ./tools/testfiles/tattr2.h5 ./tools/testfiles/tall-2A.ddl +./tools/testfiles/tall-2A0.ddl ./tools/testfiles/tall-2B.ddl ./tools/testfiles/tattrcontents1.ddl ./tools/testfiles/tattrcontents2.ddl @@ -1619,6 +1622,7 @@ ./tools/h5dump/errfiles/filter_fail.err ./tools/h5dump/errfiles/tall-1.err ./tools/h5dump/errfiles/tall-2A.err +./tools/h5dump/errfiles/tall-2A0.err ./tools/h5dump/errfiles/tall-2B.err ./tools/h5dump/errfiles/tarray1_big.err ./tools/h5dump/errfiles/tattr-3.err @@ -2403,8 +2407,12 @@ ./config/cmake/NSIS.template.in ./config/cmake/NSIS.InstallOptions.ini.in +# CMake-specific User Files +./config/cmake/UserMacros/Windows_MT.cmake + ./CMakeLists.txt ./CTestConfig.cmake +./UserMacros.cmake ./c++/CMakeLists.txt ./c++/examples/CMakeLists.txt ./c++/src/CMakeLists.txt |