Brian Anderson 63fcbcf3ce Merge remote-tracking branch 'rust-lang/master' ... Conflicts: mk/tests.mk src/liballoc/arc.rs src/liballoc/boxed.rs src/liballoc/rc.rs src/libcollections/bit.rs src/libcollections/btree/map.rs src/libcollections/btree/set.rs src/libcollections/dlist.rs src/libcollections/ring_buf.rs src/libcollections/slice.rs src/libcollections/str.rs src/libcollections/string.rs src/libcollections/vec.rs src/libcollections/vec_map.rs src/libcore/any.rs src/libcore/array.rs src/libcore/borrow.rs src/libcore/error.rs src/libcore/fmt/mod.rs src/libcore/iter.rs src/libcore/marker.rs src/libcore/ops.rs src/libcore/result.rs src/libcore/slice.rs src/libcore/str/mod.rs src/libregex/lib.rs src/libregex/re.rs src/librustc/lint/builtin.rs src/libstd/collections/hash/map.rs src/libstd/collections/hash/set.rs src/libstd/sync/mpsc/mod.rs src/libstd/sync/mutex.rs src/libstd/sync/poison.rs src/libstd/sync/rwlock.rs src/libsyntax/feature_gate.rs src/libsyntax/test.rs		2015-01-25 01:20:55 -08:00
..
archive_ro.rs	std: Redesign c_str and c_vec	2015-01-05 08:00:13 -08:00
diagnostic.rs	Replace 0 as *const/mut T with ptr::null/null_mut()	2015-01-19 08:27:09 +03:00
lib.rs	Merge remote-tracking branch 'rust-lang/master'	2015-01-25 01:20:55 -08:00