]> git.lizzy.rs Git - rust.git/commitdiff
Auto merge of #30401 - DiamondLovesYou:pnacl-target, r=alexcrichton
authorbors <bors@rust-lang.org>
Sat, 19 Dec 2015 21:29:04 +0000 (21:29 +0000)
committerbors <bors@rust-lang.org>
Sat, 19 Dec 2015 21:29:04 +0000 (21:29 +0000)
r? @alexcrichton

1  2 
src/librustc_llvm/lib.rs

Simple merge