]> git.lizzy.rs Git - rust.git/commit
Merge remote-tracking branch 'brson/sched-cleanup'
authorBrian Anderson <banderson@mozilla.com>
Tue, 16 Apr 2013 03:47:01 +0000 (20:47 -0700)
committerBrian Anderson <banderson@mozilla.com>
Tue, 16 Apr 2013 18:23:13 +0000 (11:23 -0700)
commit7bfd0e5035418bc162304ef87a5c5630abfe3830
tree709158f9af1c7a460f41b58839e644d806080ec0
parent447caf9bdb8b769581fcd8c337634da431d21954
parent1f94364aeff935eebadd3ae47dbae3eb099023da
Merge remote-tracking branch 'brson/sched-cleanup'

Conflicts:
src/libcore/rt/sched/mod.rs
src/libcore/rt/sched/mod.rs
src/libcore/rt/uvio.rs