projects / cargo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d1ec90b 5fb7a4f)
Merge branch 'integration-tests'
authorYehuda Katz <wycats@gmail.com>
Thu, 20 Mar 2014 21:10:29 +0000 (14:10 -0700)
committerYehuda Katz <wycats@gmail.com>
Thu, 20 Mar 2014 21:10:29 +0000 (14:10 -0700)
Conflicts:
Makefile
src/bin/cargo-read-manifest.rs
src/bin/cargo-rustc.rs
src/cargo/mod.rs
src/cargo/util/process_builder.rs
tests/test_cargo_compile.rs


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.