auto merge of #4635 : jdm/servo/updatemozjs, r=jdm

This commit is contained in:
bors-servo 2015-01-14 16:24:46 -07:00
commit ddf77a1cff
3 changed files with 3 additions and 3 deletions

View file

@ -496,7 +496,7 @@ source = "git+https://github.com/hyperium/mime.rs#7898f1c29c7f5d35d0c3c7aed37ebc
[[package]] [[package]]
name = "mozjs-sys" name = "mozjs-sys"
version = "0.0.0" version = "0.0.0"
source = "git+https://github.com/servo/mozjs#0dd618fcc78fe7aa64e4e2a3b0f7f0d8a2f0f08a" source = "git+https://github.com/servo/mozjs#39ed76a3a9d3834a6e1f106d1043efff9b5d6608"
[[package]] [[package]]
name = "msg" name = "msg"

2
ports/cef/Cargo.lock generated
View file

@ -464,7 +464,7 @@ source = "git+https://github.com/hyperium/mime.rs#7898f1c29c7f5d35d0c3c7aed37ebc
[[package]] [[package]]
name = "mozjs-sys" name = "mozjs-sys"
version = "0.0.0" version = "0.0.0"
source = "git+https://github.com/servo/mozjs#0dd618fcc78fe7aa64e4e2a3b0f7f0d8a2f0f08a" source = "git+https://github.com/servo/mozjs#39ed76a3a9d3834a6e1f106d1043efff9b5d6608"
[[package]] [[package]]
name = "msg" name = "msg"

2
ports/gonk/Cargo.lock generated
View file

@ -418,7 +418,7 @@ source = "git+https://github.com/hyperium/mime.rs#7898f1c29c7f5d35d0c3c7aed37ebc
[[package]] [[package]]
name = "mozjs-sys" name = "mozjs-sys"
version = "0.0.0" version = "0.0.0"
source = "git+https://github.com/servo/mozjs#0dd618fcc78fe7aa64e4e2a3b0f7f0d8a2f0f08a" source = "git+https://github.com/servo/mozjs#39ed76a3a9d3834a6e1f106d1043efff9b5d6608"
[[package]] [[package]]
name = "msg" name = "msg"