From 477a22beff2db98964738e3bc06f25e11756c254 Mon Sep 17 00:00:00 2001 From: Victor Felder Date: Fri, 11 Oct 2013 20:23:12 +0200 Subject: [PATCH] Merge fail --- free-programming-books.md | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/free-programming-books.md b/free-programming-books.md index 868a67b89..3e0d25369 100644 --- a/free-programming-books.md +++ b/free-programming-books.md @@ -244,7 +244,8 @@ ###Django - +* [Djen of Django](http://agiliq.com/books/djenofdjango/) +* [Django by Example](http://www.lightbird.net/dbe/) ###Emacs @@ -330,7 +331,7 @@ * [Mozilla Developer Network's JavaScript Guide](https://developer.mozilla.org/en/JavaScript/Guide) * [JavaScript Allongé](https://leanpub.com/javascript-allonge/read) * [Learning JavaScript Design Patterns](http://addyosmani.com/resources/essentialjsdesignpatterns/book/) - +* [O'Reilly Programming JavaScript Applications - Early Release](http://chimera.labs.oreilly.com/books/1234000000262/index.html) ###JavaScript (Node.js specific) @@ -394,11 +395,6 @@ * [HGInit - Mercurial Tutorial by Joel Spolsky](http://hginit.com/) -###Nemerle - -* See .NET below - - ###.NET (C# / VB / Nemerle / Visual Studio) * [C# Essentials](http://www.techotopia.com/index.php/C_Sharp_Essentials)