]> git.lizzy.rs Git - rust.git/commit
rollup merge of #22459: alexcrichton/feature-names
authorAlex Crichton <alex@alexcrichton.com>
Tue, 17 Feb 2015 23:16:22 +0000 (15:16 -0800)
committerAlex Crichton <alex@alexcrichton.com>
Wed, 18 Feb 2015 01:26:59 +0000 (17:26 -0800)
commitd8ba8b00a7be7c9aba8fb5a6c0174e526c5a3d4d
treee5174e340d1249a638ed4b75fa52d22309bf8e66
parentc166fd3041208bda4a55e1fcaaf14a38cc3d6158
parenta2ebb24ee6cc76791ef834cb2d17ecac95756499
rollup merge of #22459: alexcrichton/feature-names

Conflicts:
src/rustbook/main.rs
src/librustc_driver/lib.rs
src/librustc_llvm/lib.rs
src/libstd/old_io/mod.rs
src/libterm/lib.rs
src/rustbook/main.rs