]> git.lizzy.rs Git - rust.git/commit
Another round of test fixes and merge conflicts
authorAlex Crichton <alex@alexcrichton.com>
Tue, 22 Oct 2013 16:36:30 +0000 (09:36 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Thu, 24 Oct 2013 21:22:35 +0000 (14:22 -0700)
commit188e471339dfe652b8ff9f3bbe4cc262a040c584
treed7267619b1909f2deaf319c560a64d667d141d35
parentd425218395b4a4dd7c6e4f3d680447efd2a3abc6
Another round of test fixes and merge conflicts
16 files changed:
src/libextra/url.rs
src/librustpkg/tests.rs
src/librustpkg/testsuite/pass/src/c-dependencies/pkg.rs
src/librustpkg/testsuite/pass/src/fancy-lib/pkg.rs
src/libstd/rt/io/signal.rs
src/libstd/rt/io/stdio.rs
src/libstd/rt/rtio.rs
src/libstd/rt/task.rs
src/libstd/rt/uv/file.rs
src/libstd/rt/uv/idle.rs
src/libstd/rt/uv/signal.rs
src/libstd/rt/uv/uvio.rs
src/libstd/rt/uv/uvll.rs
src/libstd/run.rs
src/rt/rust_uv.cpp
src/rt/rustrt.def.in