Merge remote-tracking branch 'origin/master' into scheduler_activate_root
Conflicts: examples/main.c src/runner.c src/scheduler.c src/task.h
examples/CoolingHalo/README
0 → 100644
Conflicts: examples/main.c src/runner.c src/scheduler.c src/task.h