Merge branch 'master' of github:ornladios/ADIOS2 into adios1 (a60a0592) · Commits · Podhorszki, Norbert / ADIOS2 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

A

ADIOS2
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

a60a0592

Commit a60a0592 authored 7 years ago by Podhorszki, Norbert

Downloads
- Plain Diff

Merge branch 'master' of github:ornladios/ADIOS2 into adios1

parents ac17ba1b 63187fce

No related branches found

No related tags found

1 merge request!41ADIOS1 Write engine, Selections, Variable.SetSelection() and updated Heat Transfer example

Changes 9

Hide whitespace changes

Inline Side-by-side

Showing

CMakeLists.txt 2 additions, 2 deletions

CMakeLists.txt
Contributing.md 7 additions, 0 deletions

Contributing.md
examples/hello/bpWriter/CMakeLists.txt 7 additions, 7 deletions

examples/hello/bpWriter/CMakeLists.txt
examples/hello/datamanReader/CMakeLists.txt 10 additions, 10 deletions

examples/hello/datamanReader/CMakeLists.txt
examples/hello/datamanWriter/CMakeLists.txt 10 additions, 10 deletions

examples/hello/datamanWriter/CMakeLists.txt
examples/hello/timeBP/CMakeLists.txt 10 additions, 10 deletions

examples/hello/timeBP/CMakeLists.txt
scripts/developer/git/setup-aliases 3 additions, 3 deletions

scripts/developer/git/setup-aliases
scripts/developer/git/setup-remotes 1 addition, 1 deletion

scripts/developer/git/setup-remotes
source/CMakeLists.txt 70 additions, 28 deletions

source/CMakeLists.txt

with 120 additions and 71 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment