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

Merge branch 'master' into subset_sorting 

Conflicts:
	src/engine.c
	src/runner.h
	src/runner_doiact.h
	src/scheduler.c
parents 8fd03f26 0c4ceb01
No related branches found
No related tags found
1 merge request!343Subset sorting
Hide whitespace changes
Inline Side-by-side
Showing
with 940 additions and 282 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment