Commit Graph

52 Commits

Author SHA1 Message Date
Paul Rouget
28021e56e2 servo: Merge #7331 - prevent division by 0 (from paulrouget:issue-7316); r=SimonSapin
Fix #7316

Source-Repo: https://github.com/servo/servo
Source-Revision: 524b02dbf7c2d8ef0d3a453124075f7718f7e458
2015-08-24 05:08:41 -06:00
Patrick Walton
faf0032ca9 servo: Merge #7312 - Initial (very rudimentary) flexbox implementation (from servo:flex-experimental); r=SimonSapin
This is #7154 with two additional commits (that I did rather than ask @zentner-kyle to do it because it was a bit tricky.)

r? @pcwalton for the last two commit

r=me+pcwalton in #7154 for earlier commits.

Source-Repo: https://github.com/servo/servo
Source-Revision: 5e83a3f0a3bab226cca849ab33fa3322ef71813d
2015-08-21 17:19:20 -06:00