]> git.proxmox.com Git - cargo.git/commitdiff
projects / cargo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bbed786 d43fd2e)
Auto merge of #3667 - jbendig:required_features, r=alexcrichton
authorbors <bors@rust-lang.org>
Fri, 10 Feb 2017 22:12:37 +0000 (22:12 +0000)
committerbors <bors@rust-lang.org>
Fri, 10 Feb 2017 22:12:37 +0000 (22:12 +0000)
Added required_features for issue #1570.

Based on PR #2056 by @tsurai and PR #2325 by @JanLikar

I tried to fix most everything that was talked about in the previous pull requests. Docs still need to be updated though.

1  2 
src/cargo/ops/cargo_compile.rs patch | diff1 | diff2 | blob | history
src/doc/manifest.md patch | diff1 | diff2 | blob | history

diff --cc src/cargo/ops/cargo_compile.rs
Simple merge
diff --cc src/doc/manifest.md
Simple merge
backport for Debian buster