Merge branch 'master' of github.com:ligurio/free-programming-books into ligurio-master

Conflicts:
	README.md
This commit is contained in:
Victor Felder 2014-06-19 17:49:47 +02:00
commit edfaecd5ff

View File

@ -58,7 +58,12 @@ It's [easy](https://github.com/vhf/free-programming-books/wiki/Contribution). Pl
### Interactive Programming Resources
+ Free interactive programming tutorials: [github](/free-programming-interactive-tutorials-en.md) or [site](http://resrc.io/list/217/programming-interactive-tutorials/)
### Podcast - Screencast
Free Podcasts and Screencasts:
+ English: [github](/free-podcasts-screencasts-en.md)
### Software Testing Books
+ [Free ebooks about software testing](https://github.com/ligurio/free-software-testing-books)