Skip to content
Snippets Groups Projects
Commit 396a42fe authored by William F Godoy's avatar William F Godoy
Browse files

Merge remote-tracking branch 'upstream/master' into refactor 

Conflicts:
	examples/experimental/multistep/reader_allsteps.cpp
	examples/experimental/multistep/reader_stepping.cpp
	examples/experimental/multistep/writer_multistep.cpp
	examples/hello/README.md
	examples/hello/bpWriter/helloBPWriter.cpp
	examples/hello/hdf5Writer/helloHDF5Writer.cpp
	source/adios2/engine/hdf5/HDF5Common.cpp
	source/adios2/engine/hdf5/HDF5WriterP.cpp
	source/adios2/engine/hdf5/HDF5WriterP.h
parents 77a5923b f25085c9
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 1074 additions and 378 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment