]> git.lizzy.rs Git - rust.git/commitdiff
auto merge of #16440 : bheesham/rust/master, r=brson
authorbors <bors@rust-lang.org>
Thu, 14 Aug 2014 09:31:19 +0000 (09:31 +0000)
committerbors <bors@rust-lang.org>
Thu, 14 Aug 2014 09:31:19 +0000 (09:31 +0000)
  * `rust.md`: changes for consistency

  * `guide-ffi.md`: wrapped inline code

NOTE: This is a duplicate of #16375. I completely messed up that fork, so I made a new fork.

1  2 
src/doc/rust.md

diff --cc src/doc/rust.md
Simple merge