]> git.lizzy.rs Git - rust.git/commit
rollup merge of #24377: apasel422/docs
authorAlex Crichton <alex@alexcrichton.com>
Tue, 14 Apr 2015 17:56:57 +0000 (10:56 -0700)
committerAlex Crichton <alex@alexcrichton.com>
Tue, 14 Apr 2015 17:56:57 +0000 (10:56 -0700)
commitae7959d298c95d5ffdeae8e7c3f3659d7fc28cdb
tree575fb3a8174b9103d9976f8f665c75e0922ccb1b
parent7913f5659d2dd8e8de74d25ad2594b219aa460cc
parent6fa16d6a473415415cb87a1fe6754aace32cbb1c
rollup merge of #24377: apasel422/docs

Conflicts:
src/libstd/net/ip.rs
src/libstd/sys/unix/fs.rs
src/libstd/sys/unix/mod.rs
src/libstd/sys/windows/mod.rs
16 files changed:
src/libcollections/string.rs
src/libcore/iter.rs
src/libcore/result.rs
src/libstd/collections/hash/map.rs
src/libstd/ffi/c_str.rs
src/libstd/ffi/os_str.rs
src/libstd/fs.rs
src/libstd/io/mod.rs
src/libstd/net/ip.rs
src/libstd/path.rs
src/libstd/process.rs
src/libstd/sys/unix/ext.rs
src/libstd/sys/unix/os.rs
src/libstd/sys/windows/ext.rs
src/libstd/sys/windows/os.rs
src/libstd/thread/mod.rs