Auto merge of #16931 - nox:font-feature-descriptor, r=emilio

Support font-feature-settings as a @font-face descriptor

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16931)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-05-19 07:49:27 -05:00 committed by GitHub
commit 61d64daf4c
7 changed files with 191 additions and 124 deletions

View file

@ -83,6 +83,9 @@ extern crate time;
#[allow(unused_extern_crates)]
extern crate unicode_segmentation;
#[macro_use]
mod macros;
pub mod animation;
#[allow(missing_docs)] // TODO.
#[cfg(feature = "servo")] pub mod attr;