about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-06-25 10:47:01 -0700
committerbors <bors@rust-lang.org>2013-06-25 10:47:01 -0700
commit032dcc57e8876e960837c3a050be2c7570e7eafd (patch)
tree0e63580109393a724f823d21c9668eb25466d796 /src/libstd
parentd161e630d8378e9705987e0b746d8dbf0da48842 (diff)
parent92424f0670723e417a96a96310a6ad871994c6b7 (diff)
downloadrust-032dcc57e8876e960837c3a050be2c7570e7eafd.tar.gz
rust-032dcc57e8876e960837c3a050be2c7570e7eafd.zip
auto merge of #7371 : alexcrichton/rust/trying, r=cmr
This is an attempt at a smaller request than #7113, it's just the first two commits
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/std.rs (renamed from src/libstd/core.rc)0
1 files changed, 0 insertions, 0 deletions
diff --git a/src/libstd/core.rc b/src/libstd/std.rs
index 13c54799fac..13c54799fac 100644
--- a/src/libstd/core.rc
+++ b/src/libstd/std.rs