]> git.lizzy.rs Git - rust.git/commit
Merge remote-tracking branch 'brson/uv'
authorBrian Anderson <banderson@mozilla.com>
Mon, 2 Jul 2012 21:03:38 +0000 (14:03 -0700)
committerBrian Anderson <banderson@mozilla.com>
Mon, 2 Jul 2012 21:03:38 +0000 (14:03 -0700)
commit6d411342c627c6a530b2fd5eebe2ef3df3523cd6
treef611b83364c8778c086ffc8aacd1f2f9c22b3c94
parentc74b3fd634754be7c151bfc1fb8ff515b69b0f9a
parent483aee8dc4a2d83fd97be0d3dfe866c45e59d521
Merge remote-tracking branch 'brson/uv'

Conflicts:
src/libstd/net_ip.rs
src/libstd/net_tcp.rs
src/libcore/vec.rs
src/libstd/net_ip.rs
src/libstd/net_tcp.rs
src/libstd/uv_ll.rs