]> git.lizzy.rs Git - rust.git/commit
Merge remote-tracking branch 'brson/nocommupstream'
authorBrian Anderson <banderson@mozilla.com>
Sat, 26 Jan 2013 01:51:53 +0000 (17:51 -0800)
committerBrian Anderson <banderson@mozilla.com>
Sat, 26 Jan 2013 02:06:30 +0000 (18:06 -0800)
commit1ef83945c1d76c9f2b9b0d087ceac65963087be7
treeb114ac7f84a0a10a3d207da0bcd3e9dcc2418e7b
parentd1f771ca341bc93e2ebe9f0ef9979a71a8e3c6d8
parent19aa88cd64c81b77b874f9396a43fedfa28f14ee
Merge remote-tracking branch 'brson/nocommupstream'

Conflicts:
src/libcore/private.rs
src/libcore/task/mod.rs
src/libcore/task/spawn.rs
src/libstd/net_tcp.rs
src/libstd/uv_global_loop.rs
src/libstd/uv_iotask.rs
17 files changed:
src/libcore/os.rs
src/libcore/pipes.rs
src/libcore/private.rs
src/libcore/private/at_exit.rs
src/libcore/private/finally.rs
src/libcore/private/global.rs
src/libcore/private/weak_task.rs
src/libcore/run.rs
src/libcore/task/mod.rs
src/libcore/task/spawn.rs
src/libstd/flatpipes.rs
src/libstd/net_ip.rs
src/libstd/net_tcp.rs
src/libstd/timer.rs
src/libstd/uv_global_loop.rs
src/libstd/uv_iotask.rs
src/rt/rust_kernel.h