]> git.lizzy.rs Git - rust.git/commitdiff
projects / rust.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3900c08 1cc9718)
Auto merge of #23267 - alexcrichton:issue-20012, r=aturon
authorbors <bors@rust-lang.org>
Fri, 20 Mar 2015 20:19:42 +0000 (20:19 +0000)
committerbors <bors@rust-lang.org>
Fri, 20 Mar 2015 20:19:42 +0000 (20:19 +0000)
This reverts commit aec67c2.

Closes #20012

This is temporarily rebased on #23245 as it would otherwise conflict, the last commit is the only one relevant to this PR though.

1  2 
src/libstd/rt/mod.rs patch | diff1 | diff2 | blob | history

diff --cc src/libstd/rt/mod.rs
Simple merge
Empowering everyone to build reliable and efficient software.