git.lizzy.rs Git - rust.git/commit

]> git.lizzy.rs Git - rust.git/commit

projects / rust.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 44f8a44 3ccf6f5)

author	Simon BD <simon@server>
	Thu, 4 Oct 2012 02:47:09 +0000 (21:47 -0500)
committer	Simon BD <simon@server>
	Thu, 4 Oct 2012 02:47:09 +0000 (21:47 -0500)
commit	efcd2385ea2389f270ff8ac8bc256636f647b130
tree	7e142ef709bc907a34ab1cb252eef6dcc0e83b91	tree \| snapshot
parent	44f8a4401ab37a45ba49db56611d77807bcbce35	commit \| diff
parent	3ccf6f5932d8223fd6c5cbf7c6ac429ca9e8912a	commit \| diff

Merge remote-tracking branch 'original/incoming' into incoming

Conflicts:
src/libstd/json.rs
src/libstd/sort.rs

src/cargo/cargo.rs	diff1 \|	diff2 \|	blob \| history
src/libstd/json.rs	diff1 \|	diff2 \|	blob \| history
src/libstd/sort.rs	diff1 \|	diff2 \|	blob \| history
src/libstd/test.rs	diff1 \|	diff2 \|	blob \| history
src/libsyntax/attr.rs	diff1 \|	diff2 \|	blob \| history
src/rustc/metadata/cstore.rs	diff1 \|	diff2 \|	blob \| history
src/rustc/metadata/encoder.rs	diff1 \|	diff2 \|	blob \| history
src/test/bench/shootout-k-nucleotide-pipes.rs	diff1 \|	diff2 \|	blob \| history
src/test/bench/shootout-k-nucleotide.rs	diff1 \|	diff2 \|	blob \| history

Empowering everyone to build reliable and efficient software.