Skip to content
Commit 71fcea8a authored by Thomas Steinreiter's avatar Thomas Steinreiter
Browse files

Merge branch 'master' into refactor_bhtree_mpi 

# Conflicts:
#	hpc_kernel_samples/n-body_methods/bhtree_mpi/src/mpimain.cpp
#	hpc_kernel_samples/n-body_methods/bhtree_mpi/src/simulation/MpiSimulation.cpp
parents 6ce8f2a5 49b5138a
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