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: 3a2530d 3fbfad3)

author	Alex Crichton <alex@alexcrichton.com>
	Fri, 30 Jan 2015 22:55:34 +0000 (14:55 -0800)
committer	Alex Crichton <alex@alexcrichton.com>
	Fri, 30 Jan 2015 22:55:34 +0000 (14:55 -0800)
commit	64dd7be2c5faae1946989c5e1df4d0c6172be1be
tree	b7e2f23e1f5c94433a84a62eef25508d4bbb71c7	tree \| snapshot
parent	3a2530d611fc92bd8094ec1745a927e059ac432a	commit \| diff
parent	3fbfad3519af1bf5dd903f6032265da0351862ea	commit \| diff

Merge remote-tracking branch 'origin/master' into rollup

Conflicts:
src/liballoc/lib.rs
src/libcore/ops.rs

13 files changed:

src/liballoc/lib.rs	diff1 \|	diff2 \|	blob \| history
src/libcore/ops.rs	diff1 \|	diff2 \|	blob \| history
src/librustc/lint/builtin.rs	diff1 \|	diff2 \|	blob \| history
src/librustc/metadata/decoder.rs	diff1 \|	diff2 \|	blob \| history
src/librustc/middle/expr_use_visitor.rs	diff1 \|	diff2 \|	blob \| history
src/librustc/middle/mem_categorization.rs	diff1 \|	diff2 \|	blob \| history
src/librustc/middle/ty.rs	diff1 \|	diff2 \|	blob \| history
src/librustc/util/ppaux.rs	diff1 \|	diff2 \|	blob \| history
src/librustc_driver/driver.rs	diff1 \|	diff2 \|	blob \| history
src/librustc_resolve/lib.rs	diff1 \|	diff2 \|	blob \| history
src/librustc_trans/trans/base.rs	diff1 \|	diff2 \|	blob \| history
src/librustc_typeck/check/mod.rs	diff1 \|	diff2 \|	blob \| history
src/librustc_typeck/check/regionck.rs	diff1 \|	diff2 \|	blob \| history

Empowering everyone to build reliable and efficient software.