Auto merge of #14961 - Ms2ger:DevicePixel, r=nox

Move DevicePixel to script_traits.

<!-- 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/14961)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-01-11 11:31:15 -08:00 committed by GitHub
commit 5d3847dddc
13 changed files with 13 additions and 27 deletions

2
Cargo.lock generated
View file

@ -660,7 +660,6 @@ dependencies = [
"compositing 0.0.1",
"devtools 0.0.1",
"euclid 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)",
"gfx_traits 0.0.1",
"gleam 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
"glutin_app 0.0.1",
"libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
@ -1023,7 +1022,6 @@ dependencies = [
"compositing 0.0.1",
"euclid 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)",
"gdi32-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"gfx_traits 0.0.1",
"gleam 0.2.30 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"msg 0.0.1",