summaryrefslogtreecommitdiff
path: root/make
Commit message (Expand)AuthorAgeFilesLines
* Prepare releaseErlang/OTP2019-12-061-1/+94
* Merge branch 'dgud/wx/fix-ifdef' into maintDan Gudmundsson2019-11-281-1/+1
|\
| * Fix awk warning about missing fileDan Gudmundsson2019-11-271-1/+1
* | Merge branch 'maint-22' into maintRickard Green2019-11-211-0/+1
|\ \ | |/ |/|
| * Prepare releaseErlang/OTP2019-11-211-4/+1
* | Merge branch 'maint-20' into maintHans Nilsson2019-11-181-4/+0
|\ \
| * | Prepare releaseErlang/OTP2019-11-151-6/+4
* | | Merge branch 'maint-22' into maintJohn Högberg2019-11-111-4/+4
|\ \ \ | | |/ | |/|
| * | Prepare releaseErlang/OTP2019-11-081-4/+4
* | | Merge branch 'maint-22' into maintMicael Karlberg2019-11-061-1/+4
|\ \ \ | |/ /
| * | Prepare releaseErlang/OTP2019-11-051-1/+4
* | | Merge branch 'maint-22' into maintMicael Karlberg2019-10-281-0/+1
|\ \ \ | |/ /
| * | Prepare releaseErlang/OTP2019-10-251-3/+1
* | | Merge branch 'maint-21' into maintHans Nilsson2019-10-251-3/+0
|\ \ \
| * | | Prepare releaseErlang/OTP2019-10-241-1/+2
* | | | Merge branch 'maint-22' into maintHans Nilsson2019-10-221-0/+3
|\ \ \ \ | | |/ / | |/| |
| * | | Prepare releaseErlang/OTP2019-10-211-1/+3
* | | | Merge branch 'maint-21' into maintPéter Dimitrov2019-10-161-1/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Prepare releaseErlang/OTP2019-10-161-4/+1
* | | | Merge branch 'maint-22' into maintIngela Anderton Andin2019-10-101-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Prepare releaseErlang/OTP2019-10-091-1/+1
* | | | Merge branch 'maint-21' into maintHans Nilsson2019-10-081-1/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Prepare releaseErlang/OTP2019-10-071-7/+4
| * | | Prepare releaseErlang/OTP2019-09-111-1/+7
* | | | Merge branch 'maint-22' into maintJohn Högberg2019-10-081-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Prepare releaseErlang/OTP2019-10-071-4/+1
* | | | Merge branch 'maint-20' into maintHans Nilsson2019-10-071-4/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Prepare releaseErlang/OTP2019-10-041-4/+6
* | | | Merge branch 'maint-22' into maintRickard Green2019-09-271-0/+4
|\ \ \ \ | | |/ / | |/| |
| * | | Prepare releaseErlang/OTP2019-09-261-125/+4
* | | | Bump patch merge versionRickard Green2019-09-271-1/+1
* | | | Update for developmentHenrik Nord2019-09-171-125/+1
|/ / /
* | | Prepare releaseErlang/OTP2019-09-171-1/+125
* | | Bump patch merge versionRickard Green2019-09-171-1/+1
* | | Support fop 2.1 in the build support for the documentationLars Thorsen2019-09-091-1/+1
* | | Merge branch 'maint-21' into maintRaimo Niskanen2019-07-121-1/+0
|\ \ \ | | |/ | |/|
| * | Prepare releaseErlang/OTP2019-07-111-5/+1
* | | Merge branch 'maint-22' into maintJohn Högberg2019-07-111-5/+1
|\ \ \
| * | | Prepare releaseErlang/OTP2019-07-101-5/+1
* | | | Merge branch 'maint-22' into maintJohn Högberg2019-07-101-10/+5
|\ \ \ \ | |/ / /
| * | | Prepare releaseErlang/OTP2019-07-091-10/+5
* | | | Merge branch 'bmk/erts/esock/20190614/split_modules/OTP-15765' into maintMicael Karlberg2019-07-081-0/+4
|\ \ \ \
| * | | | [esock,kernel] net -> prim_net and add (new) netMicael Karlberg2019-06-141-0/+4
* | | | | Merge branch 'maint-22' into maintJohn Högberg2019-07-031-0/+10
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Prepare releaseErlang/OTP2019-07-021-6/+10
* | | | | Merge branch 'maint-21' into maintJohn Högberg2019-07-031-6/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Prepare releaseErlang/OTP2019-07-021-9/+5
| * | | | Prepare releaseErlang/OTP2019-06-171-6/+9
* | | | | Merge branch 'maint-22' into maintJohn Högberg2019-06-181-0/+6
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Prepare releaseErlang/OTP2019-06-171-9/+6