]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #19254 : nick29581/rust/dxr-glob, r=pcwalton
authorbors <bors@rust-lang.org>
Sat, 27 Dec 2014 00:48:41 +0000 (00:48 +0000)
committerbors <bors@rust-lang.org>
Sat, 27 Dec 2014 00:48:41 +0000 (00:48 +0000)
There is also some work here to make resolve a bit more stable - it no longer overwrites a specific import with a glob import.

r?


Trivial merge