examples/heatTransfer/IO_adios2.cpp · 3738a897c39e3a243ef8bfbb82e1f926d646c7e9 · Podhorszki, Norbert / ADIOS2

7 years ago

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

wfg authored 7 years ago

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

9761e6bd

History

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

wfg authored 7 years ago

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

Code owners

Assign users and groups as approvers for specific file changes. Learn more.