Skip to content
Snippets Groups Projects
Commit f6eb3936 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Merge branch 'new_timeline_mpi' of gitlab.cosma.dur.ac.uk:swift/swiftsim into new_timeline_mpi 

Conflicts:
	src/runner.c
parents d5ef53a3 674f1bc3
No related branches found
No related tags found
2 merge requests!304Star particle infrastructure,!303MPI send/recv fixes for inactive cells
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment