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

Merge remote-tracking branch 'origin' into tasks_cleanup 

Conflicts:
	src/engine.c
	src/scheduler.c
	src/space.c
	src/task.c
parents 98f8fde9 35b13d49
No related branches found
No related tags found
1 merge request!176Tasks cleanup
Hide whitespace changes
Inline Side-by-side
Showing
with 117 additions and 86 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment