]> git.lizzy.rs Git - rust.git/commitdiff
Merge branch 'trpl_embedding' into rollup
authorSteve Klabnik <steve@steveklabnik.com>
Wed, 13 May 2015 04:55:18 +0000 (00:55 -0400)
committerSteve Klabnik <steve@steveklabnik.com>
Wed, 13 May 2015 04:55:18 +0000 (00:55 -0400)
1  2 
src/doc/trpl/SUMMARY.md

index f3a3fd635e43ebfc28237c97bfe179b03f3b493e,29ec66861f153ae9bb67e4ca8b6b3837e9c6f943..584f24b54ada504aa7b873fe70c86b03005dae30
@@@ -6,7 -6,7 +6,8 @@@
      * [Hello, Cargo!](hello-cargo.md)
  * [Learn Rust](learn-rust.md)
      * [Guessing Game](guessing-game.md)
 +    * [Dining Philosophers](dining-philosophers.md)
+     * [Rust inside other languages](rust-inside-other-languages.md)
  * [Effective Rust](effective-rust.md)
      * [The Stack and the Heap](the-stack-and-the-heap.md)
      * [Testing](testing.md)