diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-13 19:49:35 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2015-11-13 19:49:35 +0530 |
commit | 50be4bb09ea42926a3bddb75a024e92a75e2047e (patch) | |
tree | 4f4a376c4fc63643218708c4becf45b9726b4360 | |
parent | f078f8fdf4157b4e57cef35eba00419c9c15464d (diff) | |
parent | 002a418fe8fe47dc5bb52e6b2178a7e6590dab36 (diff) | |
download | servo-50be4bb09ea42926a3bddb75a024e92a75e2047e.tar.gz servo-50be4bb09ea42926a3bddb75a024e92a75e2047e.zip |
Auto merge of #8510 - servo:mozjs, r=nox
Update mozjs.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/8510)
<!-- Reviewable:end -->
-rw-r--r-- | components/servo/Cargo.lock | 2 | ||||
-rw-r--r-- | ports/cef/Cargo.lock | 2 | ||||
-rw-r--r-- | ports/gonk/Cargo.lock | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock index 80e99560a61..288babe4af4 100644 --- a/components/servo/Cargo.lock +++ b/components/servo/Cargo.lock @@ -1139,7 +1139,7 @@ dependencies = [ [[package]] name = "mozjs_sys" version = "0.0.0" -source = "git+https://github.com/servo/mozjs#d5a1615370ccfaae35cc3bea0df46cbbb9e1ce1a" +source = "git+https://github.com/servo/mozjs#10796a16f6a8aba1e4990a0939b8b2f4a1075e55" dependencies = [ "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock index 39e2e853b0b..5e603b431a9 100644 --- a/ports/cef/Cargo.lock +++ b/ports/cef/Cargo.lock @@ -1092,7 +1092,7 @@ dependencies = [ [[package]] name = "mozjs_sys" version = "0.0.0" -source = "git+https://github.com/servo/mozjs#d5a1615370ccfaae35cc3bea0df46cbbb9e1ce1a" +source = "git+https://github.com/servo/mozjs#10796a16f6a8aba1e4990a0939b8b2f4a1075e55" dependencies = [ "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/ports/gonk/Cargo.lock b/ports/gonk/Cargo.lock index e5b12137eca..dd01dac4f23 100644 --- a/ports/gonk/Cargo.lock +++ b/ports/gonk/Cargo.lock @@ -1072,7 +1072,7 @@ dependencies = [ [[package]] name = "mozjs_sys" version = "0.0.0" -source = "git+https://github.com/servo/mozjs#d5a1615370ccfaae35cc3bea0df46cbbb9e1ce1a" +source = "git+https://github.com/servo/mozjs#10796a16f6a8aba1e4990a0939b8b2f4a1075e55" dependencies = [ "libc 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "libz-sys 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", |