Auto merge of #10291 - jfhumann:10211, r=emilio

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10291)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-04-01 01:57:20 +05:30
commit 524a004e77
15 changed files with 98 additions and 88 deletions

View file

@ -60,6 +60,9 @@ features = ["unstable"]
[dependencies.gfx_traits]
path = "../gfx_traits"
[dependencies.webrender_traits]
git = "https://github.com/servo/webrender_traits"
[dependencies]
app_units = {version = "0.2.3", features = ["plugins"]}
bitflags = "0.3"