]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #8041 : dotdash/rust/const_if_else, r=huonw
authorbors <bors@rust-lang.org>
Fri, 26 Jul 2013 16:46:49 +0000 (09:46 -0700)
committerbors <bors@rust-lang.org>
Fri, 26 Jul 2013 16:46:49 +0000 (09:46 -0700)
1  2 
src/librustc/middle/trans/common.rs

Simple merge