Commit Graph

5 Commits

Author SHA1 Message Date
Glenn Watson
9e168f34e8 servo: Merge #3486 - Improve acid2. Fix line height calculation. Text fragments get correct enclosing element style (from glennw:inline-fixes)
Reviewed-by: pcwalton
Source-Repo: https://github.com/servo/servo
Source-Revision: 94b7c486b12a50298f0706fce42b70a6ca90cdcb
2014-09-26 21:57:35 -06:00
Patrick Walton
8c9531a007 servo: Merge #3458 - layout: Implement white-space: nowrap (from pcwalton:whitespace-nowrap)
Source-Repo: https://github.com/servo/servo
Source-Revision: d9f836bc75c0d6e4e813d9f74819bd8578742598
2014-09-23 20:22:33 -07:00
Glenn Watson
0c66868669 servo: Merge #3459 - Add support for small-caps font-variant (from glennw:small-caps)
Source-Repo: https://github.com/servo/servo
Source-Revision: 98222cf24cd64c246fc25b9009f3c198bf33dcbf
2014-09-24 09:49:05 +10:00
Simon Sapin
e245f210fb servo: Merge #3438 - Upgrade Rust (from servo:rustup)
Source-Repo: https://github.com/servo/servo
Source-Revision: 045328c8e94f5bdfcd67105c5dfa9209f4cd501c
2014-09-20 15:35:08 -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