aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-09-15 13:41:55 -0500
committerGitHub <noreply@github.com>2016-09-15 13:41:55 -0500
commitcce21ad6c72d6f8c28e368b8d59f2a747247b690 (patch)
tree7ac2ac273c34301f68ab1779e92b9749452539cb
parente0e6a7be4fa00da2968acdb1d310379194a43390 (diff)
parent18de275307125a85b651893f25a360f6298002bb (diff)
downloadservo-cce21ad6c72d6f8c28e368b8d59f2a747247b690.tar.gz
servo-cce21ad6c72d6f8c28e368b8d59f2a747247b690.zip
Auto merge of #13279 - servo:sm, r=KiChjang
Update js. <!-- 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/13279) <!-- Reviewable:end -->
-rw-r--r--components/servo/Cargo.lock2
-rw-r--r--ports/cef/Cargo.lock2
2 files changed, 2 insertions, 2 deletions
diff --git a/components/servo/Cargo.lock b/components/servo/Cargo.lock
index 1ab4ada88ea..e314b6de90c 100644
--- a/components/servo/Cargo.lock
+++ b/components/servo/Cargo.lock
@@ -1112,7 +1112,7 @@ dependencies = [
[[package]]
name = "js"
version = "0.1.3"
-source = "git+https://github.com/servo/rust-mozjs#4d4466f6eb3994cf53b4c97f5d5fafd263ecb3e9"
+source = "git+https://github.com/servo/rust-mozjs#223b907b8288e672ef304aa558f521b8f7f16762"
dependencies = [
"cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/ports/cef/Cargo.lock b/ports/cef/Cargo.lock
index 7432a3e9e42..eae6ba876ca 100644
--- a/ports/cef/Cargo.lock
+++ b/ports/cef/Cargo.lock
@@ -1019,7 +1019,7 @@ dependencies = [
[[package]]
name = "js"
version = "0.1.3"
-source = "git+https://github.com/servo/rust-mozjs#4d4466f6eb3994cf53b4c97f5d5fafd263ecb3e9"
+source = "git+https://github.com/servo/rust-mozjs#223b907b8288e672ef304aa558f521b8f7f16762"
dependencies = [
"cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)",
"heapsize 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",