summaryrefslogtreecommitdiff
path: root/make
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Merge branch 'maint-20' into maintJohn Högberg2019-06-171-9/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Prepare releaseErlang/OTP2019-06-141-12/+4
* | | | Merge branch 'maint-22' into maintJohn Högberg2019-06-131-0/+9
|\ \ \ \ | | |/ / | |/| |
| * | | Prepare releaseErlang/OTP2019-06-121-11/+9
* | | | Merge branch 'maint-21' into maintIngela Anderton Andin2019-06-041-11/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Prepare releaseErlang/OTP2019-06-031-1/+6
| * | | Prepare releaseErlang/OTP2019-05-151-3/+1
* | | | Merge branch 'maint-22' into maintHans Bolinder2019-06-031-2/+11
|\ \ \ \ | | |/ / | |/| |
| * | | Prepare releaseErlang/OTP2019-05-291-2/+11
* | | | Merge branch 'maint-22' into maintIngela Anderton Andin2019-05-201-0/+2
|\ \ \ \ | |/ / /
| * | | Prepare releaseErlang/OTP2019-05-151-147/+2
* | | | Merge branch 'maint-21' into maintIngela Anderton Andin2019-05-151-147/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Prepare releaseErlang/OTP2019-05-141-8/+3
* | | | Bump patch merge versionRickard Green2019-05-141-1/+1
| |/ / |/| |
* | | Prepare releaseErlang/OTP2019-05-101-1/+147
* | | Merge branch 'maint'Rickard Green2019-05-091-1/+1
|\ \ \
| * | | Bump forward merge script versionRickard Green2019-05-091-1/+1
| * | | Merge branch 'maint-21' into maintIngela Anderton Andin2019-05-071-1/+8
| |\ \ \ | | |/ /
| | * | Prepare releaseErlang/OTP2019-05-061-1/+8
| * | | Merge branch 'maint-21' into maintHans Nilsson2019-04-261-1/+1
| |\ \ \ | | |/ /
| | * | Prepare releaseErlang/OTP2019-04-241-1/+1
| * | | Merge branch 'maint-21' into maintRaimo Niskanen2019-04-181-0/+1
| |\ \ \ | | |/ /
| | * | Prepare releaseErlang/OTP2019-04-171-3/+1
* | | | [socket] Preliminary - make socket configurableMicael Karlberg2019-04-302-2/+8
* | | | Revert "Prepare release"Rickard Green2019-04-241-136/+1
* | | | Prepare releaseErlang/OTP2019-04-231-1/+136
* | | | Merge branch 'maint'Raimo Niskanen2019-04-181-1/+1
|\ \ \ \ | |/ / /
| * | | Bump otp_patch_solve_forward_merge_versionRaimo Niskanen2019-04-181-1/+1
| * | | Merge branch 'maint-20' into maintMicael Karlberg2019-04-171-3/+0
| |\ \ \ | | | |/ | | |/|
| | * | Prepare releaseErlang/OTP2019-04-161-1/+12
| | * | Merge branch 'rickard/make-fixes-20/OTP-15657' into maint-20Erlang/OTP2019-04-161-1/+0
| | |\ \
| | * \ \ Merge branch 'rickard/make-fixes-20/OTP-15551' into maint-20Erlang/OTP2019-04-162-0/+73
| | |\ \ \
| | * | | | Prepare releaseErlang/OTP2019-02-151-2/+1
| * | | | | Merge branch 'maint-21' into maintRickard Green2019-04-151-6/+3
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |