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

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

View file

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