]> git.lizzy.rs Git - rust.git/commit
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)
commit3c60bc02ce6de2823d0b837f90d5db0077fce6f7
tree465805adb25fba470b8da95ff820a363f32a8dee
parentc06edbad34f2f8f2fa5138e855a442db1c6324d1
parent4b92a5a229ebe7635851fc7bad94108f9de8dcc6
auto merge of #19254 : nick29581/rust/dxr-glob, r=pcwalton

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?