diff options
| author | bors-servo <release+servo@mozilla.com> | 2013-12-17 09:04:28 -0800 |
|---|---|---|
| committer | bors-servo <release+servo@mozilla.com> | 2013-12-17 09:04:28 -0800 |
| commit | 45c092cea45bc6ece8cfd9b891617385ac2060b3 (patch) | |
| tree | 5de5d1761d46bca8454802e153879620650be4bf /src/components/script/macros.rs | |
| parent | ad7f3a95d4c3e22273e02bee3adc98286090a3a2 (diff) | |
| parent | c4c332b234ba907da43b7c2b9b320d7d06a09807 (diff) | |
| download | servo-45c092cea45bc6ece8cfd9b891617385ac2060b3.tar.gz servo-45c092cea45bc6ece8cfd9b891617385ac2060b3.zip | |
auto merge of #1377 : SimonSapin/servo/encoding, r=kmcallister
Depends on https://github.com/mozilla-servo/rust-cssparser/pull/33 being merged.
Also (unrelated) pass around a base URL for stylesheets.
Adds a new dependency:
Upstream: https://github.com/lifthrasiir/rust-encoding
Servo’s fork: https://github.com/mozilla-servo/rust-encoding
As of this writing, upstream’s master branch targets Rust 0.8, and its rust-0.9-pre branch targets Rust master. Servo uses a Rust version in-between those. I pushed a rust-servo branch to our fork that backports from rust-0.9-pre, and also included some changes that have yet to be merged in upstream pull requests.
Diffstat (limited to 'src/components/script/macros.rs')
0 files changed, 0 insertions, 0 deletions