Skip to content
Commit 1713850c authored by Jeremy Soller's avatar Jeremy Soller
Browse files

Merge branch 'cancellation' into 'master' 

Handle but don't impl scheme cancellation.

See merge request redox-os/redoxfs!70
parents 14a07dc2 efb29941
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment