diff options
| author | Brian Anderson <banderson@mozilla.com> | 2013-04-23 15:16:04 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2013-04-23 19:19:32 -0700 |
| commit | e944c7dadeed48b199df6891603ae063233ec5a8 (patch) | |
| tree | bb1fe84012278b82d45eb7c6544da42f3be17285 /src/rt/rust_kernel.cpp | |
| parent | 8708e0c099400f363a5b95806847bd12d780000a (diff) | |
| parent | 2a819ae465c5f375df00ead0b3f4c9009da23f25 (diff) | |
| download | rust-e944c7dadeed48b199df6891603ae063233ec5a8.tar.gz rust-e944c7dadeed48b199df6891603ae063233ec5a8.zip | |
Merge remote-tracking branch 'brson/io'
This also reverts some changes to TLS that were leaking memory. Conflicts: src/libcore/rt/uv/net.rs src/libcore/task/local_data_priv.rs src/libcore/unstable/lang.rs
Diffstat (limited to 'src/rt/rust_kernel.cpp')
0 files changed, 0 insertions, 0 deletions