Skip to content

GitLab

Commit 22c88736 authored by Massimiliano Culpo's avatar Massimiliano Culpo
Browse files

Merge branch 'qa/out_of_source_build' of gitlab.cosma.dur.ac.uk:swift/swiftsim... 

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

Conflicts:
	tests/testReading.c
parents 109bccd6 214ef8a8
Hide whitespace changes
Inline Side-by-side
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment