• James Willis's avatar
    Merge branch 'master' into intrinsic-vectorisation · 506dad4a
    James Willis authored
    Conflicts:
    	src/hydro/Default/hydro_iact.h
    	src/hydro/Gadget2/hydro.h
    	src/hydro/Gadget2/hydro_debug.h
    	src/hydro/Gadget2/hydro_iact.h
    	src/hydro/Gadget2/hydro_part.h
    	tests/testInteractions.c
    	tests/testSymInt.c
    506dad4a