Merge remote-tracking branch 'upstream/master'

Because I contributed something
This commit is contained in:
David McInnis 2016-02-08 10:13:06 -08:00
commit 53aa82fec0
2 changed files with 2 additions and 1 deletions

View File

@ -244,7 +244,7 @@
### Rust
* [Язык программирования Rust](http://kgv.github.io/rust_book_ru/)
* [Язык программирования Rust](http://rurust.github.io/rust_book_ru/)
### Scala

View File

@ -1924,6 +1924,7 @@ For resources on Angular, Backbone, D3, Dojo, Ember, Express, jQuery, Knockout,
* [Rust by Example](http://rustbyexample.com)
* [Rust for Rubyists](http://www.rustforrubyists.com/book/index.html)
* [The Rust Programming Language](http://doc.rust-lang.org/book/)
* [The Rustonomicon](https://doc.rust-lang.org/nomicon/)
* [Why Rust?](http://www.oreilly.com/programming/free/files/why-rust.pdf) (PDF)