Skip to content
Snippets Groups Projects
Commit deb696e9 authored by Pedro Gonnet's avatar Pedro Gonnet
Browse files

Merge branch 'master' of gitlab.cosma.dur.ac.uk:swift/swiftsim into tasks_cleanup 

Conflicts:
	src/engine.c
	src/engine.h
	src/scheduler.c
	src/task.c
	tests/testKernel.c
parents 0e7632c6 971e3057
No related branches found
No related tags found
1 merge request!176Tasks cleanup
Hide whitespace changes
Inline Side-by-side
Showing
with 110 additions and 77 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment