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: baa1c18 f8dffc6)

author	Brian Anderson <banderson@mozilla.com>
	Fri, 3 May 2013 03:51:56 +0000 (20:51 -0700)
committer	Brian Anderson <banderson@mozilla.com>
	Fri, 3 May 2013 03:51:56 +0000 (20:51 -0700)
commit	6c478c7de889ec4943b9dcdcbfbb8a8244f479cc
tree	7f9fd01150a7611007255cbb2e45cf41e0cd4989	tree \| snapshot
parent	baa1c1834f608c8c789db6d2495626ff9d28dd96	commit \| diff
parent	f8dffc6789113a10c9dbf1d815c3569b19b53e96	commit \| diff

Merge remote-tracking branch 'brson/io' into incoming

Conflicts:
mk/rt.mk
src/libcore/run.rs

src/libcore/core.rc	diff1 \|	diff2 \|	blob \| history
src/libcore/sys.rs	diff1 \|	diff2 \|	blob \| history
src/libcore/task/mod.rs	diff1 \|	diff2 \|	blob \| history
src/libcore/unstable/lang.rs	diff1 \|	diff2 \|	blob \| history
src/librustc/middle/trans/glue.rs	diff1 \|	diff2 \|	blob \| history
src/libsyntax/ext/expand.rs	diff1 \|	diff2 \|	blob \| history
src/rt/rustrt.def.in	diff1 \|	diff2 \|	blob \| history

Empowering everyone to build reliable and efficient software.