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: f1ddb8d 6818e24)

author	Brian Anderson <banderson@mozilla.com>
	Tue, 30 Apr 2013 01:28:01 +0000 (18:28 -0700)
committer	Brian Anderson <banderson@mozilla.com>
	Wed, 1 May 2013 00:01:27 +0000 (17:01 -0700)
commit	4a4646fd54a85f78512e5f2d1d2cd253954d1ea4
tree	11e6e1bd26bf1cbdd278f30978fb632b0c74d7f7	tree \| snapshot
parent	f1ddb8d5cc66941763039d3f727465b7cc34a100	commit \| diff
parent	6818e241b49c03c0fe0994dbe8340e2d8f482f09	commit \| diff

Merge remote-tracking branch 'brson/io'

Conflicts:
src/libcore/task/local_data_priv.rs

12 files changed:

src/libcore/core.rc	diff1 \|	diff2 \|	blob \| history
src/libcore/rt/sched/mod.rs	diff1 \|	diff2 \|	blob \| history
src/libcore/rt/uv/mod.rs	diff1 \|	diff2 \|	blob \| history
src/libcore/rt/uvll.rs	diff1 \|	diff2 \|	blob \| history
src/libcore/sys.rs	diff1 \|	diff2 \|	blob \| history
src/libcore/task/local_data_priv.rs	diff1 \|	diff2 \|	blob \| history
src/libcore/task/mod.rs	diff1 \|	diff2 \|	blob \| history
src/libcore/task/spawn.rs	diff1 \|	diff2 \|	blob \| history
src/libcore/unstable/lang.rs	diff1 \|	diff2 \|	blob \| history
src/libsyntax/ext/expand.rs	diff1 \|	diff2 \|	blob \| history
src/rt/rust_task.cpp	diff1 \|	diff2 \|	blob \| history
src/rt/rust_upcall.cpp	diff1 \|	diff2 \|	blob \| history

Empowering everyone to build reliable and efficient software.