r0e 73b4ed40f9 servo: Merge #6162 - Pending load guard does not assert if thread is panicking (from r0e:testing); r=jdm ...

Fixes issue #6148

@jdm After mulling over this for a little while, i'm not sure if this approach is correct. Any comments?

Source-Repo: https://github.com/servo/servo
Source-Revision: 6595ebed0f50658b8f6d12f9c37017df5ea26efa

2015-05-25 16:33:43 -05:00

..

image

servo: Merge #5935 - Upgrade Rust (from servo:rustup_2015-04-25); r=Ms2ger

2015-05-05 09:11:30 -05:00

Cargo.toml

servo: Merge #6021 - Upgrade to Hyper 0.4.0 (from SimonSapin:hyperup); r=Manishearth

2015-05-12 12:42:49 -05:00

image_cache_task.rs

servo: Merge #5586 - net: Don't load the placeholder image for background images, only for image fragments (from pcwalton:no-broken-background-image-redux); r=glennw

2015-05-20 16:43:31 -05:00

lib.rs

servo: Merge #6162 - Pending load guard does not assert if thread is panicking (from r0e:testing); r=jdm

2015-05-25 16:33:43 -05:00

storage_task.rs

servo: Merge #5888 - Prepare for the rustup (from Ms2ger:prepare-rustup); r=SimonSapin

2015-04-28 17:52:49 -05:00