[svn-r28660] merge from trunk.

1 files changed, 78 insertions, 5 deletions

diff --git a/MANIFEST b/MANIFEST
index 537a947..56ebf77 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -32,7 +32,7 @@
 ./README.txt
 ./BRANCH.txt
 ./acsite.m4
-./autogen.sh         
+./autogen.sh
 ./configure.ac
 
 ./bin/COPYING
@@ -49,6 +49,7 @@
 ./bin/deploy
 ./bin/distdep
 ./bin/errors              _DO_NOT_DISTRIBUTE_
+./bin/genparser
 ./bin/gcov_script            _DO_NOT_DISTRIBUTE_
 ./bin/h5vers
 ./bin/iostats
@@ -585,12 +586,12 @@
 ./src/H5FScache.c
 ./src/H5FSdbg.c
 ./src/H5FSmodule.h
-./src/H5FStest.c
-./src/H5FSstat.c
 ./src/H5FSpkg.h
 ./src/H5FSprivate.h
 ./src/H5FSpublic.h
 ./src/H5FSsection.c
+./src/H5FSstat.c
+./src/H5FStest.c
 ./src/H5G.c
 ./src/H5Gbtree2.c
 ./src/H5Gcache.c
@@ -644,9 +645,11 @@
 ./src/H5HL.c
 ./src/H5HLcache.c
 ./src/H5HLdbg.c
+./src/H5HLdblk.c
 ./src/H5HLint.c
 ./src/H5HLmodule.h
 ./src/H5HLpkg.h
+./src/H5HLprfx.c
 ./src/H5HLprivate.h
 ./src/H5HLpublic.h
 ./src/H5HP.c
@@ -2256,7 +2259,6 @@
 ./tools/perform/sio_standalone.h
 ./tools/perform/zip_perf.c
 
-
 # high level libraries
 ./hl/COPYING
 ./hl/Makefile.am
@@ -2297,7 +2299,10 @@
 ./hl/src/H5IMprivate.h
 ./hl/src/H5IMpublic.h
 ./hl/src/H5LT.c
+./hl/src/H5LTanalyze.c
 ./hl/src/H5LTanalyze.l
+./hl/src/H5LTparse.c
+./hl/src/H5LTparse.h
 ./hl/src/H5LTparse.y
 ./hl/src/H5LTprivate.h
 ./hl/src/H5LTpublic.h
@@ -2525,4 +2530,72 @@
 
 # CMake-specific User Scripts
 ./config/cmake/scripts/CTestScript.cmake
-./config/cmake/scripts/HDF518config.cmake
+./config/cmake/scripts/HDF5config.cmake
+
+# Files generated by autogen
+./aclocal.m4
+./autom4te.cache/output.0
+./autom4te.cache/requests
+./autom4te.cache/traces.0
+./bin/compile
+./bin/config.guess
+./bin/config.sub
+./bin/depcomp
+./bin/install-sh
+./bin/ltmain.sh
+./bin/missing
+./bin/test-driver
+./c++/examples/Makefile.in
+./c++/Makefile.in
+./configure
+./c++/src/Makefile.in
+./c++/test/Makefile.in
+./examples/Makefile.in
+./fortran/examples/Makefile.in
+./fortran/Makefile.in
+./fortran/src/Makefile.in
+./fortran/test/Makefile.in
+./fortran/testpar/Makefile.in
+./hl/c++/examples/Makefile.in
+./hl/c++/Makefile.in
+./hl/c++/src/Makefile.in
+./hl/c++/test/Makefile.in
+./hl/examples/Makefile.in
+./hl/fortran/examples/Makefile.in
+./hl/fortran/Makefile.in
+./hl/fortran/src/Makefile.in
+./hl/fortran/test/Makefile.in
+./hl/Makefile.in
+./hl/src/Makefile.in
+./hl/test/Makefile.in
+./hl/tools/gif2h5/Makefile.in
+./hl/tools/Makefile.in
+./m4/libtool.m4
+./m4/lt~obsolete.m4
+./m4/ltoptions.m4
+./m4/ltsugar.m4
+./m4/ltversion.m4
+./Makefile.in
+./src/H5config.h.in
+./src/H5Edefin.h
+./src/H5Einit.h
+./src/H5Epubgen.h
+./src/H5Eterm.h
+./src/H5overflow.h
+./src/H5version.h
+./src/Makefile.in
+./test/Makefile.in
+./testpar/Makefile.in
+./tools/h5copy/Makefile.in
+./tools/h5diff/Makefile.in
+./tools/h5dump/Makefile.in
+./tools/h5import/Makefile.in
+./tools/h5jam/Makefile.in
+./tools/h5ls/Makefile.in
+./tools/h5repack/Makefile.in
+./tools/h5stat/Makefile.in
+./tools/lib/Makefile.in
+./tools/Makefile.in
+./tools/misc/Makefile.in
+./tools/misc/vds/Makefile.in
+./tools/perform/Makefile.in