auto merge of #4392 : michaelwu/servo/fix-gonk-20141216, r=jdm

This commit is contained in:
bors-servo 2014-12-16 13:31:08 -07:00
commit b6a593650b

2
ports/gonk/Cargo.lock generated
View file

@ -335,6 +335,7 @@ dependencies = [
name = "layout"
version = "0.0.1"
dependencies = [
"cssparser 0.1.0 (git+https://github.com/servo/rust-cssparser)",
"encoding 0.2.0 (git+https://github.com/lifthrasiir/rust-encoding)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"gfx 0.0.1",
@ -606,6 +607,7 @@ dependencies = [
name = "util"
version = "0.0.1"
dependencies = [
"cssparser 0.1.0 (git+https://github.com/servo/rust-cssparser)",
"geom 0.1.0 (git+https://github.com/servo/rust-geom)",
"layers 0.1.0 (git+https://github.com/servo/rust-layers)",
"string_cache 0.0.0 (git+https://github.com/servo/string-cache)",