Merge branch 'master' into bump-gecko-media

This commit is contained in:
Marcin Mielniczuk 2017-12-18 15:29:20 +01:00 committed by GitHub
commit b35c6bc14e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
131 changed files with 2480 additions and 1444 deletions

View file

@ -4,7 +4,7 @@
Servo is a prototype web browser engine written in the
[Rust](https://github.com/rust-lang/rust) language. It is currently developed on
64-bit OS X, 64-bit Linux, and Android.
64-bit OS X, 64-bit Linux, 64-bit Windows, and Android.
Servo welcomes contribution from everyone. See
[`CONTRIBUTING.md`](CONTRIBUTING.md) and [`HACKING_QUICKSTART.md`](docs/HACKING_QUICKSTART.md)