Matt Brubeck be415107d3 servo: Merge #15594 - Fix initial value of align-content and justify-content (from mbrubeck:align-content-fix); r=Manishearth ...

This fixes a trivial mistake in #15533, caused by me misreading the spec. r? @Manishearth

Source-Repo: https://github.com/servo/servo
Source-Revision: 3fa9ce16db910c0b44617dafdcd8e76b6f813c61

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : 668d521e0ecc9c92b9d5f7af48d72eeffc490815

2017-02-16 18:16:28 -08:00

..

atoms

servo: Merge #15314 - Permissions API and WebBluetooth integration (from szeged:permissions-api); r=jdm

2017-02-14 08:09:22 -08:00

bluetooth

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

bluetooth_traits

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

canvas

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

canvas_traits

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

compositing

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

config

servo: Merge #15164 - Revert several changes that broke tests (from mbrubeck:revert); r=emilio

2017-01-24 11:14:28 -08:00

constellation

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

debugger

servo: Merge #14592 - Remove the util crate (from asajeffrey:util-goodbye); r=mbrubeck

2016-12-14 16:48:42 -08:00

deny_public_fields

servo: Merge #15545 - Kill some more plugins (from nox:plugin); r=SimonSapin

2017-02-15 01:24:39 -08:00

devtools

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

devtools_traits

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

domobject_derive

servo: Merge #15567 - Replace inheritance_integrity by trait shenanigans (from nox:plugin); r=SimonSapin

2017-02-15 20:49:47 -08:00

geometry

servo: Merge #15154 - Update rustc to 1.16.0-nightly (7821a9b99 2017-01-23) (from servo:rustup); r=SimonSapin

2017-01-24 06:11:40 -08:00

gfx

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

gfx_traits

servo: Merge #15154 - Update rustc to 1.16.0-nightly (7821a9b99 2017-01-23) (from servo:rustup); r=SimonSapin

2017-01-24 06:11:40 -08:00

jstraceable_derive

servo: Merge #14889 - Upgrade to rustc 1.16.0-nightly (6f1ae663e 2017-01-06) (from servo:rustup); r=jdm

2017-01-07 08:18:28 -08:00

layout

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

layout_thread

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

layout_traits

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

msg

servo: Merge #15552 - Update cssparser to 0.9 (from servo:cssparserup); r=nox

2017-02-15 03:58:38 -08:00

net

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

net_traits

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

plugins

servo: Merge #15584 - Move script lints to script_plugins (from nox:plugin); r=jdm

2017-02-16 10:58:19 -08:00

profile

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

profile_traits

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

rand

servo: Merge #15107 - convert less interesting debug! logs to traces (from DexterHaslem:15100-convert-debug-to-traces); r=cbrewster

2017-01-18 21:29:59 -08:00

range

servo: Merge #15515 - Remove rustc-serialize from range (from nox:rustc-serialize); r=jdm

2017-02-12 04:55:40 -08:00

remutex

servo: Merge #15107 - convert less interesting debug! logs to traces (from DexterHaslem:15100-convert-debug-to-traces); r=cbrewster

2017-01-18 21:29:59 -08:00

script

servo: Merge #15358 - Allow browsing contexts to resolve to cross-origin windows (from asajeffrey:script-browsingcontext-xorigin-window); r=jdm

2017-02-16 16:57:05 -08:00

script_layout_interface

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

script_plugins

servo: Merge #15584 - Move script lints to script_plugins (from nox:plugin); r=jdm

2017-02-16 10:58:19 -08:00

script_traits

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

selectors

servo: Merge #15552 - Update cssparser to 0.9 (from servo:cssparserup); r=nox

2017-02-15 03:58:38 -08:00

servo

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

style

servo: Merge #15594 - Fix initial value of align-content and justify-content (from mbrubeck:align-content-fix); r=Manishearth

2017-02-16 18:16:28 -08:00

style_traits

servo: Merge #15552 - Update cssparser to 0.9 (from servo:cssparserup); r=nox

2017-02-15 03:58:38 -08:00

url

servo: Merge #15154 - Update rustc to 1.16.0-nightly (7821a9b99 2017-01-23) (from servo:rustup); r=SimonSapin

2017-01-24 06:11:40 -08:00

webdriver_server

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

webvr

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00

webvr_traits

servo: Merge #15537 - Update ipc-channel to 0.6.3 (from servo:webrender); r=SimonSapin

2017-02-16 03:53:49 -08:00