Skip to content
Snippets Groups Projects
Commit 0554b01f authored by wfg's avatar wfg
Browse files

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

Fixed
Conflicts:
	include/engine/bp/BPFileReader.h
	source/core/Transport.cpp
	source/engine/bp/BPFileReader.cpp
	source/engine/bp/BPFileWriter.cpp
	source/format/BP1.cpp     ---> Removed
	source/format/BP1Aggregator.cpp ---> Removed
	source/format/BP1Writer.cpp ---> Removed
	source/transport/file/FileDescriptor.cpp
parents f2ea5efc f7013dcd
No related branches found
No related tags found
2 merge requests!48Utilities,!45Code structure changes and syntax
Hide whitespace changes
Inline Side-by-side
Showing
with 190 additions and 141 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