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

Merge branch 'master' into rebuild_criteria 

Conflicts:
	src/cell.c
	src/engine.c
	src/runner.c
	src/task.h
parents 034fdf34 4ced9d5b
No related branches found
No related tags found
1 merge request!327Rebuild criteria
Hide whitespace changes
Inline Side-by-side
Showing
with 375 additions and 304 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment