Skip to content
Snippets Groups Projects
Commit 9f70a0cb authored by Alexei Borissov's avatar Alexei Borissov
Browse files

Merge branch 'mpi_stars2_matthieu' into eagle-stellar-evolution

Conflicts:
	src/cell.h
	src/engine_maketasks.c
	src/engine_marktasks.c
	src/runner.c
	src/space.c
	src/stars/EAGLE/stars.h
	src/stars/EAGLE/stars_iact.h
	src/stars/EAGLE/stars_part.h
parents ab51d695 49276852
Branches
Tags
3 merge requests!787Eagle stellar evolution matthieu,!781Eagle stellar evolution,!778Fix default models
Showing
with 1847 additions and 1259 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment