servo/components
bors-servo fd994c457e Auto merge of #10655 - mbrubeck:merge-margin, r=SimonSapin
Update margins when merging inline fragments

Fixes #10633.  r? @pcwalton

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10655)
<!-- Reviewable:end -->
2016-04-17 08:18:04 +05:30
..
canvas webgl: Make the api return the context limits and use them for validations 2016-04-03 01:21:56 +02:00
canvas_traits Auto merge of #10291 - jfhumann:10211, r=emilio 2016-04-01 01:57:20 +05:30
compositing Auto merge of #10345 - asajeffrey:make-nox-happy, r=nox 2016-04-15 17:35:45 +05:30
devtools Use serde in devtools 2016-03-31 11:07:18 +02:00
devtools_traits Use serde in devtools 2016-03-31 11:07:18 +02:00
gfx Auto merge of #10587 - asajeffrey:add-failure-panic-message, r=Manishearth 2016-04-14 19:55:17 +05:30
gfx_traits Added panic message to failures. 2016-04-13 16:09:48 -05:00
layout Auto merge of #10655 - mbrubeck:merge-margin, r=SimonSapin 2016-04-17 08:18:04 +05:30
layout_traits Deny unsafe code in more crates. 2016-03-18 14:43:03 +01:00
msg Added panic message to failures. 2016-04-13 16:09:48 -05:00
net Auto merge of #10650 - jdm:disabletfd, r=KiChjang 2016-04-17 02:50:19 +05:30
net_traits Auto merge of #10189 - KiChjang:cors-preflight-fetch, r=jdm 2016-04-13 21:28:25 +05:30
plugins Rust upgrade to 2016-04-12 2016-04-15 15:28:49 +05:30
profile Take the stdout lock when printing profile data 2016-04-14 12:28:00 -07:00
profile_traits use self.0 instead of destructing single item tuple structs 2016-03-27 11:50:08 +01:00
range Deny unsafe code in more crates. 2016-03-18 14:43:03 +01:00
script Fix Document#elementFromPoint no viewport available test 2016-04-16 17:16:27 +07:00
script_traits Added panic message to failures. 2016-04-13 16:09:48 -05:00
servo Auto merge of #10572 - Manishearth:and-now-his-watch-is-ended, r=asajeffrey 2016-04-16 04:03:41 +05:30
style Auto merge of #10643 - mbrubeck:empty-span-border, r=pcwalton 2016-04-17 03:31:12 +05:30
style_traits Report memory usage from LayoutThreadData Stylist [#7038] 2016-03-19 11:53:13 -07:00
util Remove watcher threads; replace with more panic handler goodness 2016-04-15 01:52:33 +05:30
webdriver_server Update to byteorder 0.5 2016-04-13 16:36:02 +05:30