Merge branch 'jsgame' of github.com:johand/free-programming-books into johand-jsgame

Conflicts:
	free-programming-books.md
This commit is contained in:
Victor Felder 2013-10-31 10:12:23 +01:00
commit ca9d3c9ed5

View File

@ -635,6 +635,7 @@
####Wicket
* [Official Free Online Guide for Apache Wicket framework](http://wicket.apache.org/guide/)
###JavaScript
* [Crockford's JavaScript](http://www.crockford.com/javascript/) - Douglas Crockford
* [Eloquent JavaScript](http://eloquentjavascript.net/) - Marijn Haverbeke
@ -649,6 +650,7 @@
* [Javascript Succinctly, Syncfusion](http://www.syncfusion.com/resources/techportal/ebooks/javascript) (PDF, Kindle) *(Just fill the fields with any values)*
* [Dev Docs](http://devdocs.io/)
* [Managing Space and Time with JavaScript - Book 1: The Basics](http://www.noelrappin.com/) - Noel Rappin
* [Learn to Code JavaScript by Playing a Game](http://codecombat.com)
####Angular.js