]> git.lizzy.rs Git - rust.git/commit
Auto merge of #31263 - dhuseby:fixing_bsd_builds, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 3 Feb 2016 06:38:01 +0000 (06:38 +0000)
committerbors <bors@rust-lang.org>
Wed, 3 Feb 2016 06:38:01 +0000 (06:38 +0000)
commit54664f188403a5bb72634b5e3ba9b2f7b60b4d9f
tree6c680499f3822c50f9e900b2acc079bf4ca0f0b1
parent50df6b9dc5144df09ef6b8519afd3657abdab03f
parentca6f9203461f57a1f1a88266efeb61a5aa47d66b
Auto merge of #31263 - dhuseby:fixing_bsd_builds, r=alexcrichton

Something went haywire with github last night and the old PR https://github.com/rust-lang/rust/pull/31230 got closed somehow.  This new PR is to replace the old one.  This incorporates all of the feedback from the other PR.

@alexcrichton I incorporated the suggestion from @semarie and the result is cleaner and clearer.  I think this is ready to go.