Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 06:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #4012 : glennw/servo/update-green-rs, r=mbrubeck

Browse source
This commit is contained in:
bors-servo 2014-11-16 20:21:28 -07:00
commit a51d08737a
4 changed files with 15 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Cargo.lock generated
View file

@ -227,6 +227,7 @@ dependencies = [
"net 0.0.1", "net 0.0.1",
"plugins 0.0.1", "plugins 0.0.1",
"png 0.1.0 (git+https://github.com/servo/rust-png)", "png 0.1.0 (git+https://github.com/servo/rust-png)",
"script_traits 0.0.1",
"stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)", "stb_image 0.1.0 (git+https://github.com/servo/rust-stb-image)",
"style 0.0.1", "style 0.0.1",
"url 0.1.0 (git+https://github.com/servo/rust-url)", "url 0.1.0 (git+https://github.com/servo/rust-url)",
@ -295,7 +296,7 @@ dependencies = [
[[package]] [[package]]
name = "green" name = "green"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf" source = "git+https://github.com/servo/green-rs?ref=servo#9300d7e7dc73680c7446d78b10a309095636e64d"
[[package]] [[package]]
name = "harfbuzz" name = "harfbuzz"
@ -481,10 +482,10 @@ source = "git+https://github.com/netvl/rust-xml#d6c57380a300b94f7e7881979dbe5459
[[package]] [[package]]
name = "rustuv" name = "rustuv"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf" source = "git+https://github.com/servo/green-rs?ref=servo#9300d7e7dc73680c7446d78b10a309095636e64d"
dependencies = [ dependencies = [
"green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)", "green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
"tls 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)", "tls 0.0.1 (git+https://github.com/alexcrichton/tls-rs)",
] ]
[[package]] [[package]]
@ -585,7 +586,7 @@ version = "0.0.1"
[[package]] [[package]]
name = "tls" name = "tls"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf" source = "git+https://github.com/alexcrichton/tls-rs#2abeb8996f3795f1e870523b7684dcc2ce64fa85"
[[package]] [[package]]
name = "url" name = "url"

2
components/gfx/Cargo.toml
View file

@ -59,4 +59,6 @@ git = "https://github.com/servo/rust-core-graphics"
[dependencies.core_text] [dependencies.core_text]
git = "https://github.com/servo/rust-core-text" git = "https://github.com/servo/rust-core-text"
[dependencies.script_traits]
path = "../script_traits"

8
ports/android/glut_app/Cargo.lock generated
View file

@ -273,7 +273,7 @@ dependencies = [
[[package]] [[package]]
name = "green" name = "green"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf" source = "git+https://github.com/servo/green-rs?ref=servo#9300d7e7dc73680c7446d78b10a309095636e64d"
[[package]] [[package]]
name = "harfbuzz" name = "harfbuzz"
@ -464,10 +464,10 @@ source = "git+https://github.com/netvl/rust-xml#d6c57380a300b94f7e7881979dbe5459
[[package]] [[package]]
name = "rustuv" name = "rustuv"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf" source = "git+https://github.com/servo/green-rs?ref=servo#9300d7e7dc73680c7446d78b10a309095636e64d"
dependencies = [ dependencies = [
"green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)", "green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
"tls 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)", "tls 0.0.1 (git+https://github.com/alexcrichton/tls-rs)",
] ]
[[package]] [[package]]
@ -579,7 +579,7 @@ version = "0.0.1"
[[package]] [[package]]
name = "tls" name = "tls"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf" source = "git+https://github.com/alexcrichton/tls-rs#2abeb8996f3795f1e870523b7684dcc2ce64fa85"
[[package]] [[package]]
name = "url" name = "url"

8
ports/cef/Cargo.lock generated
View file

@ -303,7 +303,7 @@ dependencies = [
[[package]] [[package]]
name = "green" name = "green"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf" source = "git+https://github.com/servo/green-rs?ref=servo#9300d7e7dc73680c7446d78b10a309095636e64d"
[[package]] [[package]]
name = "harfbuzz" name = "harfbuzz"
@ -489,10 +489,10 @@ source = "git+https://github.com/netvl/rust-xml#d6c57380a300b94f7e7881979dbe5459
[[package]] [[package]]
name = "rustuv" name = "rustuv"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf" source = "git+https://github.com/servo/green-rs?ref=servo#9300d7e7dc73680c7446d78b10a309095636e64d"
dependencies = [ dependencies = [
"green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)", "green 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)",
"tls 0.0.1 (git+https://github.com/servo/green-rs?ref=servo)", "tls 0.0.1 (git+https://github.com/alexcrichton/tls-rs)",
] ]
[[package]] [[package]]
@ -610,7 +610,7 @@ version = "0.0.1"
[[package]] [[package]]
name = "tls" name = "tls"
version = "0.0.1" version = "0.0.1"
source = "git+https://github.com/servo/green-rs?ref=servo#332144c9d876e5df00235a72c0563b6b12473dcf" source = "git+https://github.com/alexcrichton/tls-rs#2abeb8996f3795f1e870523b7684dcc2ce64fa85"
[[package]] [[package]]
name = "url" name = "url"