Auto merge of #19229 - servo:bumps, r=emilio

Bump image and offscreen_gl_context

<!-- 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/19229)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-11-15 20:58:46 -06:00 committed by GitHub
commit 9ec17ca347
7 changed files with 70 additions and 71 deletions

View file

@ -20,7 +20,7 @@ gleam = "0.4"
ipc-channel = "0.9"
log = "0.3.5"
num-traits = "0.1.32"
offscreen_gl_context = { version = "0.12", features = ["serde", "osmesa"] }
offscreen_gl_context = { version = "0.13", features = ["serde", "osmesa"] }
servo_config = {path = "../config"}
webrender = {git = "https://github.com/servo/webrender"}
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}

View file

@ -17,7 +17,7 @@ lazy_static = "0.2"
malloc_size_of = { path = "../malloc_size_of" }
malloc_size_of_derive = { path = "../malloc_size_of_derive" }
nonzero = {path = "../nonzero"}
offscreen_gl_context = { version = "0.12", features = ["serde"] }
offscreen_gl_context = { version = "0.13", features = ["serde"] }
serde = "1.0"
servo_config = {path = "../config"}
webrender_api = {git = "https://github.com/servo/webrender", features = ["ipc"]}

View file

@ -13,7 +13,7 @@ path = "lib.rs"
euclid = "0.15"
gfx_traits = {path = "../gfx_traits"}
gleam = "0.4"
image = "0.16"
image = "0.17"
ipc-channel = "0.9"
libc = "0.2"
log = "0.3.5"

View file

@ -13,7 +13,7 @@ path = "lib.rs"
cookie = "0.6"
hyper = "0.10"
hyper_serde = "0.7"
image = "0.16"
image = "0.17"
ipc-channel = "0.9"
lazy_static = "0.2"
log = "0.3.5"

View file

@ -52,7 +52,7 @@ half = "1.0"
html5ever = "0.21"
hyper = "0.10"
hyper_serde = "0.7"
image = "0.16"
image = "0.17"
ipc-channel = "0.9"
jstraceable_derive = {path = "../jstraceable_derive"}
lazy_static = "0.2"
@ -69,7 +69,7 @@ msg = {path = "../msg"}
net_traits = {path = "../net_traits"}
nonzero = {path = "../nonzero"}
num-traits = "0.1.32"
offscreen_gl_context = { version = "0.12", features = ["serde"] }
offscreen_gl_context = { version = "0.13", features = ["serde"] }
open = "1.1.1"
parking_lot = "0.4"
phf = "0.7.18"

View file

@ -14,7 +14,7 @@ base64 = "0.6"
cookie = "0.6"
euclid = "0.15"
hyper = "0.10"
image = "0.16"
image = "0.17"
ipc-channel = "0.9"
log = "0.3.5"
msg = {path = "../msg"}