Skip to content
Snippets Groups Projects
Commit 6437a305 authored by James Willis's avatar James Willis
Browse files

Merge branch 'master' into doself2-vectorisation

Conflicts:
	src/cache.h
	src/hydro/Gadget2/hydro_iact.h
	src/kernel_hydro.h
	src/runner_doiact_vec.c
	src/runner_doiact_vec.h
	src/vector.h
	tests/benchmarkInteractions.c
	tests/testKernel.c
parents 2666bfea 1969a156
No related branches found
No related tags found
1 merge request!406Doself2 vectorisation
Showing
with 351 additions and 456 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment