summaryrefslogtreecommitdiff
path: root/make
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Ingela Anderton Andin2021-03-261-61/+0
|\
| * Merge tag 'OTP-23.2.7.1' into maintIngela Anderton Andin2021-03-261-4/+0
| |\
| | * Prepare releaseErlang/OTP2021-03-251-4/+1
| * | Prepare for developmentHenrik Nord2021-03-241-61/+1
* | | Revert "Prepare release"Henrik Nord2021-03-261-170/+1
* | | Prepare releaseErlang/OTP2021-03-251-1/+170
* | | Merge branch 'maint'Henrik Nord2021-03-241-0/+61
|\ \ \ | |/ /
| * | Prepare releaseErlang/OTP2021-03-221-1/+61
| * | Merge branch 'maint-23' into maintRaimo Niskanen2021-03-031-3/+3
| |\ \ | | |/
| | * Prepare releaseErlang/OTP2021-03-021-3/+3
| * | Merge branch 'maint-23' into maintIngela Anderton Andin2021-02-251-0/+4
| |\ \ | | |/
| | * Prepare releaseErlang/OTP2021-02-241-3/+3
| * | Merge branch 'maint-22' into maintRickard Green2021-02-191-4/+0
| |\ \
| | * | Prepare releaseErlang/OTP2021-02-191-1/+2
| | * | macOS: Remove version check in configure scriptBjörn Gustavsson2021-02-181-44/+0
| | * | Prepare releaseErlang/OTP2021-01-191-3/+1
| * | | Merge branch 'maint-23' into maintIngela Anderton Andin2021-02-161-4/+3
| |\ \ \ | | | |/ | | |/|
| | * | Prepare releaseErlang/OTP2021-02-151-4/+3
| * | | Merge branch 'maint-23' into maintIngela Anderton Andin2021-02-041-0/+5
| |\ \ \ | | |/ /
| | * | Prepare releaseErlang/OTP2021-02-041-4/+4
| * | | Merge branch 'maint-21' into maintLukas Larsson2021-01-251-5/+0
| |\ \ \
| | * | | Prepare releaseErlang/OTP2021-01-251-4/+1
| * | | | Merge branch 'maint-23' into maintHans Nilsson2021-01-201-0/+5
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Prepare releaseErlang/OTP2021-01-201-6/+3
| * | | | Merge branch 'maint-21' into maintHans Nilsson2021-01-201-8/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Prepare releaseErlang/OTP2021-01-191-5/+4
| | * | | Prepare releaseErlang/OTP2020-10-021-3/+5
| | * | | Prepare releaseErlang/OTP2020-07-221-4/+3
| | * | | Prepare releaseErlang/OTP2020-05-191-4/+4
| | * | | Prepare releaseErlang/OTP2020-04-241-3/+5
| * | | | Merge branch 'maint-23' into maintIngela Anderton Andin2021-01-151-0/+8
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Prepare releaseErlang/OTP2021-01-151-1/+7
| * | | | Merge branch 'maint-22' into maintRickard Green2021-01-131-2/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Prepare releaseErlang/OTP2021-01-121-5/+3
* | | | | Revert "Prepare release"Henrik Nord2021-02-241-147/+1
* | | | | Prepare releaseErlang/OTP2021-02-231-1/+147
* | | | | Merge branch 'maint'Sverker Eriksson2021-01-112-4/+4
|\ \ \ \ \ | |/ / / /
| * | | | Merge 'sverker/address-sanitizer' into maint OTP-16959Sverker Eriksson2021-01-112-4/+4
| |\ \ \ \
| | * | | | erts: Add address-sanitizer build target 'asan'Sverker Eriksson2020-12-182-4/+4
* | | | | | Merge branch 'maint'Rickard Green2020-12-231-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'rickard/configure/ERL-1447/OTP-17093' into maintRickard Green2020-12-231-2/+2
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Fix uses of AC_CONFIG_AUX_DIRS() in configure scriptsRickard Green2020-12-211-2/+2
* | | | | | Merge branch 'maint'Lukas Larsson2020-12-211-69/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch 'maint-23' into maintLukas Larsson2020-12-211-0/+2
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | |
| | * | | Prepare releaseErlang/OTP2020-12-211-68/+1
| * | | | Prepare for developmentHenrik Nord2020-12-161-69/+1
| |/ / /
* | | | Merge branch 'maint'Henrik Nord2020-12-161-0/+69
|\ \ \ \ | |/ / /
| * | | Prepare releaseErlang/OTP2020-12-111-1/+69
* | | | Merge branch 'maint'Lukas Larsson2020-12-092-2/+7
|\ \ \ \ | |/ / /
| * | | otp: Do not build doc xml deps if not neededLukas Larsson2020-12-082-2/+7