aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/lib.rs
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-04-28 19:48:45 -0500
committerbors-servo <metajack+bors@gmail.com>2015-04-28 19:48:45 -0500
commit1e150140bd12624ad357e3168fb496079fb8ec7c (patch)
tree238b47e1dc4329095025773e9ff14d2d0f51d83f /components/layout/lib.rs
parent0a4db7ae0f581a959863bd5159766795c6caf8d8 (diff)
parent544a02a25068a92dfd9e950eb3609713ad9599c7 (diff)
downloadservo-1e150140bd12624ad357e3168fb496079fb8ec7c.tar.gz
servo-1e150140bd12624ad357e3168fb496079fb8ec7c.zip
Auto merge of #5480 - SimonSapin:multicol, r=pcwalton
This add some properties to the style system and a new flow type, but the larger issues of dealing with fragmentation in the flow tree is still an open question. <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5480) <!-- Reviewable:end -->
Diffstat (limited to 'components/layout/lib.rs')
-rw-r--r--components/layout/lib.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/components/layout/lib.rs b/components/layout/lib.rs
index 7fbbb2d3576..844689f0534 100644
--- a/components/layout/lib.rs
+++ b/components/layout/lib.rs
@@ -78,6 +78,7 @@ pub mod incremental;
pub mod inline;
pub mod list_item;
pub mod model;
+pub mod multicol;
pub mod opaque_node;
pub mod parallel;
pub mod sequential;