Skip to content
Snippets Groups Projects
Commit 5d14dc4d authored by Andreas Gattringer's avatar Andreas Gattringer
Browse files

Merge branch 'main' into features/grid-access 

# Conflicts:
#	src/modules/butterflies/butterflies_dispersal.c
#	src/modules/butterflies/butterflies_generations.c
#	src/modules/butterflies/butterflies_populations.c
parents 7e6346e9 abf5fc80
Branches
No related tags found
1 merge request!1preparations for multi-scale simulations
Hide whitespace changes
Inline Side-by-side
Showing
with 24 additions and 39 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment