summaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeLines
* Merge pull request #177 from johncowie/masterAdam Bard2013-08-08-0/+5
|\ | | | | Explain git pull default behaviour and the use of --rebase flag.
| * Explain git pull default behaviour and the use of --rebase flag.John Cowie2013-08-08-0/+5
|/ | | By far the pull command I use the most is 'git pull --rebase', so wanted to add some info to make it clear that that's possible.
* Merge pull request #171 from hirohope/masterAdam Bard2013-08-08-0/+490
|\ | | | | Added python-es file
| * Add python-es fileCamilo Garrido2013-08-07-0/+490
| |
* | Merge pull request #169 from eranation/patch-1Adam Bard2013-08-07-2/+4
|\ \ | |/ |/| fixed some broken / missing markdown links and added a resource
| * fixed some broken / missing markdown links and added a resourceEran Medan2013-08-07-2/+4
|/
* Merge pull request #165 from Willyfrog/correction_linkAdam Bard2013-08-07-2/+3
|\ | | | | added contact info and norvig's text translated link
| * added contact info and norvig's text translated linkGuillermo Vaya2013-08-06-2/+3
| |
* | Merge pull request #166 from greybird/masterAdam Bard2013-08-07-0/+46
|\ \ | | | | | | Add Ruby
| * \ Merge branch 'master' of github.com:greybird/learnxinyminutes-docsgreybird2013-08-07-5/+2025
| |\ \
| | * | Merge remote-tracking branch 'upstream/master'greybird2013-08-06-3/+10
| | |\|
| | * | Merge remote-tracking branch 'upstream/master'greybird2013-08-06-0/+0
| | |\ \
| | * | | C: Signed/unsigned clarificationTrent Ogren2013-08-06-1/+1
| | | | |
| * | | | Ruby. Difference between class instance variables and class variablesgreybird2013-08-07-0/+46
| | | | |
* | | | | Merge pull request #167 from cssmagic/masterAdam Bard2013-08-07-4/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | Fix tiny typos.
| * | | | Fix tiny typos.cssmagic2013-08-07-4/+4
|/ / / /
* | | | Merge pull request #164 from louiedinh/masterLouie Dinh2013-08-05-3/+10
|\ \ \ \ | |_|_|/ |/| | | Fix a typo and add more references.
| * | | Expand on References. Add Books.Louie Dinh2013-08-05-2/+9
| | | |
| * | | Fix typoldinh2013-08-05-1/+1
|/ / /
* | | Merge pull request #162 from misfo/patch-1Adam Bard2013-08-05-1/+1
|\ \ \ | |_|/ |/| | C: Signed/unsigned clarification
| * | C: Signed/unsigned clarificationTrent Ogren2013-08-05-1/+1
|/ /
* | Merge branch 'master' of https://github.com/adambard/learnxinyminutes-docsAdam2013-08-05-2/+2
|\ \
| * | Merge pull request #161 from greybird/masterAdam Bard2013-08-05-2/+2
| |\| | | | | | | fix IEF in javascript
| | * fix immediately-executing functiongreybird2013-08-05-2/+2
| | |
* | | Line lenght edits for c-esAdam2013-08-05-6/+14
|/ /
* | Changed c-es to utf8Adam2013-08-05-84/+84
| |
* | Merge branch 'master-es' of ↵Adam2013-08-05-0/+417
|\ \ | | | | | | | | | https://github.com/FlaskBreaker/learnxinyminutes-docs into FlaskBreaker-master-es
| * | Added c-esFlaskBreaker2013-08-05-0/+417
| |/
* | Merge pull request #160 from Willyfrog/elisp-translationAdam Bard2013-08-05-0/+377
|\ \ | | | | | | emacs lisp translated
| * | emacs lisp translatedGuillermo Vaya2013-08-05-0/+377
| | |
* | | Merge pull request #158 from oa414/masterAdam Bard2013-08-05-0/+329
|\ \ \ | | | | | | | | Add ruby-cn
| * | | Add ruby-cnLinxiangyu2013-08-05-0/+329
| | |/ | |/|
* | | Merge pull request #155 from lpy/masterAdam Bard2013-08-05-0/+407
|\ \ \ | | | | | | | | Add Haskell zh-cn translation
| * | | Add Haskell zh-cn translationlpy2013-08-03-0/+407
| |/ /
* | | Merge pull request #154 from lichenbo/masterAdam Bard2013-08-05-1/+476
|\ \ \ | |/ / |/| | fix a typo in git-cn and add python-cn
| * | add python-cnChenbo Li2013-08-03-0/+475
| | |
| * | fix a typoChenbo Li2013-08-03-2/+2
| | |
| * | fix a typoChenbo Li2013-08-03-1/+1
| | |
| * | Merge branch 'master' of https://github.com/adambard/learnxinyminutes-docsChenbo Li2013-08-03-250/+419
| |\ \ | |/ / |/| |
* | | Merge pull request #152 from lichenbo/master-cnAdam Bard2013-08-02-0/+375
|\ \ \ | | | | | | | | Thanks!
* | | | Used c syntax highlighting for scala for nowAdam2013-08-02-1/+1
| | | |
* | | | corrected scalaAdam2013-08-02-1/+2
| | | |
* | | | Fixed php and removed old VB fileAdam2013-08-02-250/+3
| | | |
* | | | Updated scala for line lengthsAdam2013-08-02-33/+53
| | | |
* | | | Merge pull request #149 from petrovg/adding_scalaAdam Bard2013-08-02-0/+395
|\ \ \ \ | |_|_|/ |/| | | Adding Scala
| * | | Merge remote-tracking branch 'dbousarma/master' into adding_scalaGeorge Petrov2013-08-01-5/+134
| |\ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: scala.html.markdown
| | * | | Started on ScalaDominic Bou-Samra2013-07-04-0/+178
| | | | |
| * | | | Added tuplesGeorge Petrov2013-07-31-0/+20
| | | | |
| * | | | Header messagesGeorge Petrov2013-07-30-1/+2
| | | | |
| * | | | Tweaking the headerGeorge Petrov2013-07-29-1/+1
| | | | |