Brian Anderson d179ba3b8e Merge remote-tracking branch 'rust-lang/master' ...

Conflicts:
	src/libcore/cmp.rs
	src/libcore/fmt/mod.rs
	src/libcore/iter.rs
	src/libcore/marker.rs
	src/libcore/num/f32.rs
	src/libcore/num/f64.rs
	src/libcore/result.rs
	src/libcore/str/mod.rs
	src/librustc/lint/builtin.rs
	src/librustc/lint/context.rs
	src/libstd/sync/mpsc/mod.rs
	src/libstd/sync/poison.rs

2015-01-25 22:14:06 -08:00

..

mpsc

Merge remote-tracking branch 'rust-lang/master'

2015-01-25 22:14:06 -08:00

barrier.rs

grandfathered -> rust1

2015-01-23 21:48:20 -08:00

condvar.rs

grandfathered -> rust1

2015-01-23 21:48:20 -08:00

future.rs

Set unstable feature names appropriately

2015-01-23 13:28:40 -08:00

mod.rs

grandfathered -> rust1

2015-01-23 21:48:20 -08:00

mutex.rs

Merge remote-tracking branch 'rust-lang/master'

2015-01-25 01:20:55 -08:00

once.rs

grandfathered -> rust1

2015-01-23 21:48:20 -08:00

poison.rs

Merge remote-tracking branch 'rust-lang/master'

2015-01-25 22:14:06 -08:00

rwlock.rs

Merge remote-tracking branch 'rust-lang/master'

2015-01-25 01:20:55 -08:00

semaphore.rs

grandfathered -> rust1

2015-01-23 21:48:20 -08:00

task_pool.rs

Set unstable feature names appropriately

2015-01-23 13:28:40 -08:00