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

..

collections

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

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

ffi

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

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

io

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

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

num

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

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

path

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

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

prelude

grandfathered -> rust1

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

rand

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

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

rt

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

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

sync

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

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

sys

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

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

thread_local

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

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

time

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

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

ascii.rs

Set unstable feature names appropriately

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

bool.rs

grandfathered -> rust1

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

dynamic_lib.rs

Set unstable feature names appropriately

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

failure.rs

Set unstable feature names appropriately

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

fmt.rs

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

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

lib.rs

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

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

macros.rs

grandfathered -> rust1

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

os.rs

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

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

rtdeps.rs

Set unstable feature names appropriately

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

thread.rs

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

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

thunk.rs

Set unstable feature names appropriately

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

tuple.rs

grandfathered -> rust1

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

unit.rs

grandfathered -> rust1

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