]> git.lizzy.rs Git - rust.git/commitdiff
Merge branch 'master' into issue-30961
authorCameron Hart <cameron.hart@gmail.com>
Tue, 19 Jul 2016 10:57:49 +0000 (20:57 +1000)
committerCameron Hart <cameron.hart@gmail.com>
Tue, 19 Jul 2016 10:57:49 +0000 (20:57 +1000)
1  2 
src/librustc/session/config.rs
src/librustc_driver/lib.rs

Simple merge
Simple merge