]> git.proxmox.com Git - cargo.git/commit
Merge remote-tracking branch 'cmr/master'
authorAlex Crichton <alex@alexcrichton.com>
Wed, 27 Aug 2014 15:04:38 +0000 (08:04 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Wed, 27 Aug 2014 15:04:38 +0000 (08:04 -0700)
commitc5d0d21ea4b1ec36cfe267848e5e359cd20d264c
treee1c8c9b94aac30e1813c11c9c1f93291047a0446
parent12b5c0cd86831bf02b94fc4efd77a6ea888909ce
parent37eba4539525cee94c75fd8de753787f7e98d9ca
Merge remote-tracking branch 'cmr/master'

Conflicts:
src/cargo/ops/cargo_run.rs
tests/test_cargo_run.rs
src/bin/run.rs
src/cargo/ops/cargo_run.rs
tests/support/mod.rs
tests/test_cargo_cross_compile.rs
tests/test_cargo_run.rs