auto merge of #1247 : saneyuki/servo/rename, r=metajack

@metajack ?
This commit is contained in:
bors-servo 2013-11-13 18:40:41 -08:00
commit cbd34bcbfa
3 changed files with 2 additions and 2 deletions

View file

@ -7,7 +7,7 @@
use css::matching::MatchMethods; use css::matching::MatchMethods;
use css::select::new_stylist; use css::select::new_stylist;
use layout::aux::LayoutAuxMethods; use layout::extra::LayoutAuxMethods;
use layout::box_builder::LayoutTreeBuilder; use layout::box_builder::LayoutTreeBuilder;
use layout::context::LayoutContext; use layout::context::LayoutContext;
use layout::display_list_builder::{DisplayListBuilder}; use layout::display_list_builder::{DisplayListBuilder};

View file

@ -92,7 +92,7 @@ pub mod layout {
pub mod text; pub mod text;
pub mod util; pub mod util;
pub mod incremental; pub mod incremental;
mod aux; mod extra;
} }
pub mod windowing; pub mod windowing;