Skip to content
Snippets Groups Projects
Commit 9761e6bd authored by wfg's avatar wfg
Browse files

Merge branch 'master' of https://github.com/ornladios/ADIOS2.git 

Conflicts:
	examples/heatTransfer/IO_adios2.cpp
	include/core/VariableBase.h
	include/engine/adios1/ADIOS1Reader.h
	source/CMakeLists.txt
	source/engine/adios1/ADIOS1Reader.cpp
	source/functions/adiosFunctions.cpp
parents b13f812b 6bd06b55
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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