Ms2ger
03f803ab84
servo: Merge #4947 - Use rustc-serialize rather than the built-in deprecated serialize (from Ms2ger:serialize); r=jdm
...
Source-Repo: https://github.com/servo/servo
Source-Revision: afb152a8569953f730df564be2745c5a6302bf6f
2015-02-17 07:30:50 -07:00
Ms2ger
02ab4f60c3
servo: Merge #4922 - Fix some warnings (from servo:warnings); r=jdm
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 66f4faf44fbc6e8703d4336219a20dd3b19fb493
2015-02-13 05:33:49 -07:00
Simon Sapin
8fbd363d52
servo: Merge #4893 - Upgrade to rustc ba2f13ef0 2015-02-04 (from servo:rustup_2015-01-31); r=Ms2ger,glennw
...
Ready for review.
Final link step on android fails, but we know how to fix it and will add it to this branch soon.
Source-Repo: https://github.com/servo/servo
Source-Revision: 2cc08f289ab909de44fa09a07b2c43b70ce379b9
2015-02-11 17:24:45 -07:00
Ms2ger
a674439440
servo: Merge #4889 - Use base64 from rustc-serialize ( fixes #4747 ) (from Ms2ger:4747-base64); r=jdm
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 58b7186cea7a61645b38158053e3849d121fa487
2015-02-10 07:24:45 -07:00
Alexandru Cojocaru
0cbc5adfcf
servo: Merge #4820 - add unwrap to send/recv calls (from servo:send-recv); r=Ms2ger
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 8e6dcc7c26d88bb0452226ff8c34539e368e03d9
2015-02-03 11:24:53 -07:00
Josh Matthews
b11f7d94dc
servo: Merge #4719 - Update rustc to 00b112c45a604fa6f4b59af2a40c9deeadfdb7c6/rustc-1.0.0-dev (from servo:rustup_20150109); r=jdm
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 3f9012864a2cd927cf17a8e11dfa6922add1b7df
2015-01-27 18:15:50 -07:00
Glenn Watson
636d338cf6
servo: Merge #4405 - Update rustc to revision 3dcd2157403163789aaf21a9ab3c4d30a7c6494d (from servo:rustup_20141124); r=jdm
...
Source-Repo: https://github.com/servo/servo
Source-Revision: fbf42c951b2f53d91e2f32f8035484a07ea83493
2014-12-17 18:45:49 -07:00
Manish Goregaokar
08f0462c06
servo: Merge #4198 - Hyper+OpenSSL on Android (from Manishearth:hyper-droid); r=Manishearth
...
This is the Hyper pull request, plus the set up for OpenSSL on Android to make it merge.
Sean's commits have been reviewed in #4065 (My Android changes were reviewed by Glenn)
Source-Repo: https://github.com/servo/servo
Source-Revision: 6bd9bf979bcfa96ea14e666b59eab01a6d6c373e
2014-12-05 04:16:11 -07:00
Kshitij Parajuli
4e20eea707
servo: Merge #4000 - M1456: Shared SnifferTask (from t29:mime-sniffing); r=jdm
...
Issue: #3144
This PR addresses the second step of the ticket. i.e. move from a 1:1 sniffer:request task model to a shared sniffer task.
Source-Repo: https://github.com/servo/servo
Source-Revision: 1ac79c64da4b14f83fed6ca123a81417b9c0fc87
2014-11-28 10:51:44 -07:00
Glenn Watson
71f726977a
servo: Merge #3948 - Rust upgrade to rustc hash b03a2755193cd756583bcf5831cf4545d75ecb8a (from servo:rustup-20141105_2); r=Manishearth
...
Source-Repo: https://github.com/servo/servo
Source-Revision: c5e1b0d32e17fad29799023c85e2e73ac89c3af7
2014-11-12 20:48:31 -07:00
Simon Sapin
e245f210fb
servo: Merge #3438 - Upgrade Rust (from servo:rustup)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 045328c8e94f5bdfcd67105c5dfa9209f4cd501c
2014-09-20 15:35:08 -07:00
Josh Matthews
f4ebeb8b3b
servo: Fix broken build after denying unused imports.
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 0b0c2ef461094b5d43a97af5d39c78f22527f8a6
2014-09-14 11:02:33 -04:00
Ms2ger
489e546bee
servo: Merge #3329 - Call from_base64 on a vector slice rather than a string slice ( fixes #2877 ) (from Ms2ger:2877-base64)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 23ec53042c8ad935180e9246b6f9d97006c3e2e8
2014-09-14 09:50:34 -04:00
Sean McArthur
afc001a3da
servo: Merge #3216 - Implements about:blank in an about_loader (from seanmonstar:about-blank)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: 4e35b82770823b20e4188206fbe3ccc6514877b4
2014-09-11 16:45:06 -04:00
Jack Moffitt
132ee35633
servo: Merge #3230 - Cargoify servo (from servo:cargoify)
...
Source-Repo: https://github.com/servo/servo
Source-Revision: b1305bb7d051f83850c51bb0da0ccc86a5e07922
2014-09-09 08:18:18 -06:00
