servo: Merge #10302 - Update webrender to master (from emilio:webrender-up); r=nox

I'll rebase #10224 against it.

Sorry for the blocking of #10224, I expected it to be reviewed way sooner, my fault for landing breaking changes.

r? @nox or @pcwalton

Source-Repo: https://github.com/servo/servo
Source-Revision: 84a3dee67ea7a45d6ec505f59c7a55162621f11e
This commit is contained in:
Emilio Cobos Álvarez
2016-03-31 21:21:06 +05:00
parent 11b1ea5a73
commit bd70866e46
5 changed files with 102 additions and 51 deletions

View File

@@ -207,7 +207,7 @@ def check_lock(file_name, contents):
raise StopIteration
# package names to be neglected (as named by cargo)
exceptions = ["bitflags"]
exceptions = ["bitflags", "xml-rs", "gl_generator"]
import toml
content = toml.loads(contents)