summaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeLines
* Merge remote-tracking branch 'upstream/master'Geoff Liu2015-06-16-11/+358
|\
| * Merge pull request #1143 from Jubobs/masterLevi Bostian2015-06-16-0/+7
| |\
| | * [erlang/en] Fix #1142Julien Cretel2015-06-16-0/+7
| |/
| * Merge pull request #1141 from 7c00/update-groovy-siteLevi Bostian2015-06-16-9/+9
| |\
| | * update the groovy web site link in some docsTodd Gao2015-06-16-9/+9
| * | Merge pull request #1118 from Jubobs/masterven2015-06-16-0/+327
| |\ \ | | |/ | |/|
| | * [erlang/fr] Integrate feedback on PRJulien Cretel2015-06-14-15/+17
| | * [erlang/fr] Add french translationJulien Cretel2015-05-28-0/+325
| * | Merge pull request #1122 from avjinder/masterGeoff Liu2015-06-15-2/+15
| |\ \
| | * | Changed the order of the Stages of GitAvjinder Singh Sekhon2015-06-03-1/+1
| | * | Merge branch 'master' of git://github.com/adambard/learnxinyminutes-docsAvjinder Singh Sekhon2015-06-03-30/+159
| | |\ \
| | * | | Fixed some typosAvjinder Singh Sekhon2015-06-01-1/+1
| | * | | Added 'Stages of Git', link to Pro Git, and other forms of git helpAvjinder Singh Sekhon2015-06-01-2/+15
| * | | | Merge pull request #1136 from geoffliu/masterven2015-06-12-0/+1
| |\ \ \ \
* | | | | | Fix explanation of "and" and "or" in ruby.Geoff Liu2015-06-16-4/+8
| |/ / / / |/| | | |
* | | | | Add language marking for RGeoff Liu2015-06-11-0/+1
|/ / / /
* | | | Merge pull request #1132 from kryzhovnik/bash/ruven2015-06-10-0/+1
|\ \ \ \
| * | | | Add Andre Polykanine to bash/ru transtators listAndrey Samsonov2015-06-10-0/+1
* | | | | Merge pull request #1131 from mcanlas/masterLevi Bostian2015-06-09-24/+36
|\ \ \ \ \
| * | | | | revamped for loopsMark Canlas2015-06-10-5/+15
| * | | | | tamed indentation/whitespaceMark Canlas2015-06-10-21/+23
|/ / / / /
* | | | | Merge pull request #995 from dokato/masterAdam Bard2015-06-10-0/+637
|\ \ \ \ \
| * | | | | email addeddokato2015-03-10-1/+3
| * | | | | three bugs fixeddokato2015-03-09-3/+3
| * | | | | Small changesdokato2015-03-09-6/+12
| * | | | | First version of python script translationdokato2015-03-09-0/+629
* | | | | | Merge pull request #1081 from kryzhovnik/bash/ruAdam Bard2015-06-10-0/+283
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Fix typos and mistakes in Bash/ru translationAndrey Samsonov2015-05-26-23/+22
| * | | | | Fix typos and mistakes in Bash/ru translationsAndrey Samsonov2015-05-24-6/+6
| * | | | | Update header, fix typos and mistakes in Bash/ru translationsAndrey Samsonov2015-05-24-2/+5
| * | | | | Bash Russian translationAndrey Samsonov2015-05-03-109/+109
| * | | | | WIPAndrey Samsonov2015-05-02-0/+281
* | | | | | Merge pull request #1130 from skvale/masterven2015-06-09-2/+2
|\ \ \ \ \ \
| * | | | | | Update visualbasic.html.markdownSam Kvale2015-06-09-1/+1
| * | | | | | Update visualbasic.html.markdownSam Kvale2015-06-09-1/+1
|/ / / / / /
* | | | | | Merge pull request #1129 from ereinecke/masterLevi Bostian2015-06-07-1/+1
|\ \ \ \ \ \
| * | | | | | Merge pull request #1 from ereinecke/ereinecke-patch-1Erik Reinecke2015-06-07-1/+1
|/| | | | | |
| * | | | | | Corrected link to Groovy documentatinErik Reinecke2015-06-07-1/+1
|/ / / / / /
* | | | | | Merge pull request #1125 from Inaimathi/masterGeoff Liu2015-06-06-6/+36
|\ \ \ \ \ \
| * | | | | | Fix indentationinaimathi2015-06-06-1/+1
| * | | | | | Add notes about records to Standard ML page.inaimathi2015-06-06-6/+36
|/ / / / / /
* | | | | | Merge pull request #1123 from adamheins/masterven2015-06-03-2/+4
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Updated other exception to also be runtime_error type instead.Adam2015-06-02-1/+1
| * | | | | Using std::runtime_error instead of std::exception.Adam2015-06-02-1/+2
| * | | | | Template example class should have public method so it can get called externa...Adam2015-06-01-0/+1
| * | | | | Exceptions do not take a string argument in their constructor.Adam2015-06-01-2/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #1102 from Alwayswithme/bash-cnGeoff Liu2015-06-02-30/+159
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | command sync with english versionAlwayswithme2015-06-02-8/+6
| * | | | only capitalize first character of the variableAlwayswithme2015-06-02-16/+16
| * | | | minor revisionAlwayswithme2015-06-02-2/+2