Commit Graph

202 Commits

Author SHA1 Message Date
Patrick Walton
863992f590 servo: Merge #3293 - layout: Don't crash on floated generated content (from pcwalton:floated-generated-content-crash)
Source-Repo: https://github.com/servo/servo
Source-Revision: 20cde10e124df5c9aa9bd475bfb2b05493c114f6
2014-09-12 14:10:44 -07:00
Jack Moffitt
132ee35633 servo: Merge #3230 - Cargoify servo (from servo:cargoify)
Source-Repo: https://github.com/servo/servo
Source-Revision: b1305bb7d051f83850c51bb0da0ccc86a5e07922
2014-09-09 08:18:18 -06:00