Skip to content

Commit

Permalink
Auto merge of #1145 - brson:vs2017, r=Diggsey
Browse files Browse the repository at this point in the history
VS 2017 updates

Once rust-lang/rust#42225 lands rustup should build correctly under VS 2017.

r? @Diggsey
  • Loading branch information
bors committed Jun 1, 2017
2 parents c26a45b + 4a62f14 commit 12ffb1c
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
22 changes: 11 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ winapi = "0.2.8"
winreg = "0.3.2"
user32-sys = "0.1.2"
kernel32-sys = "0.2.1"
gcc = "0.3.49"
gcc = "0.3.50"
psapi-sys = "0.1"

[dev-dependencies]
Expand Down

0 comments on commit 12ffb1c

Please sign in to comment.