]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #12048 : sanxiyn/rust/crate-config, r=alexcrichton
authorbors <bors@rust-lang.org>
Thu, 6 Feb 2014 16:06:33 +0000 (08:06 -0800)
committerbors <bors@rust-lang.org>
Thu, 6 Feb 2014 16:06:33 +0000 (08:06 -0800)
1  2 
src/libsyntax/parse/mod.rs

Simple merge