summaryrefslogtreecommitdiff
path: root/make
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'maint'Lukas Larsson2021-10-081-2/+6
|\
| * Merge pull request #5197 from garazdawi/lukas/erl_docgen/make-docs-more-respo...Lukas Larsson2021-10-081-2/+6
| |\
| | * docgen: Make docs collapse better on small screensLukas Larsson2021-10-071-0/+1
| | * Fix `make local_html` to work betterLukas Larsson2021-09-301-2/+5
| * | Merge branch 'maint-24' into maintIngela Anderton Andin2021-10-051-8/+8
| |\ \ | | |/ | |/|
| | * Prepare releaseErlang/OTP2021-10-041-8/+8
* | | Merge pull request #5226 from garazdawi/lukas/erl_docgen/fix-hidden-docchunks...Lukas Larsson2021-10-011-2/+2
|\ \ \
| * | | docgen: Fix hidden docs for modules and functionsLukas Larsson2021-10-011-2/+2
* | | | Merge branch 'maint'Rickard Green2021-09-301-113/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'maint-24' into maintRickard Green2021-09-301-0/+8
| |\ \ \ | | | |/ | | |/|
| | * | Prepare releaseErlang/OTP2021-09-301-113/+8
| * | | Prepare for developmentHenrik Nord2021-09-221-113/+1
| |/ /
* | | Merge branch 'maint'Henrik Nord2021-09-221-0/+113
|\ \ \ | |/ /
| * | Prepare releaseErlang/OTP2021-09-171-1/+113
| |/
| * Merge branch 'maint-23' into maintRaimo Niskanen2021-09-081-5/+0
| |\
| | * Prepare releaseErlang/OTP2021-09-071-5/+3
| | * Prepare releaseErlang/OTP2021-09-021-10/+5
| * | Merge branch 'maint-24' into maintBjörn Gustavsson2021-09-031-0/+5
| |\ \
| | * | Prepare releaseErlang/OTP2021-09-021-1/+5
| * | | Merge branch 'maint-22' into maintBjörn Gustavsson2021-09-031-1/+0
| |\ \ \
| | * | | Prepare releaseErlang/OTP2021-09-021-4/+11
| | * | | Prepare releaseErlang/OTP2021-05-311-4/+4
| | * | | Prepare releaseErlang/OTP2021-05-201-5/+4
| | * | | Update configure scriptsRickard Green2021-05-191-0/+7173
| | * | | Prepare releaseErlang/OTP2021-05-051-6/+5
| | * | | Prepare releaseErlang/OTP2021-03-311-2/+6
| * | | | Merge branch 'maint-24' into maintRaimo Niskanen2021-07-301-6/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Prepare releaseErlang/OTP2021-07-301-6/+1
| * | | | Merge branch 'maint-24' into maintIngela Anderton Andin2021-07-221-0/+6
| |\ \ \ \ | | |/ / /
| | * | | Prepare releaseErlang/OTP2021-07-211-9/+6
| * | | | Merge branch 'maint-23' into maintIngela Anderton Andin2021-07-221-9/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Prepare releaseErlang/OTP2021-07-211-2/+10
| | * | | Prepare releaseErlang/OTP2021-06-161-5/+2
| | * | | Prepare releaseErlang/OTP2021-06-091-8/+5
| | * | | Prepare releaseErlang/OTP2021-05-311-4/+8
| * | | | Merge branch 'rickard/cross-build-host-triplets-check/ERIERL-668/OTP-17514' i...Rickard Green2021-07-052-0/+34
| |\ \ \ \
* | \ \ \ \ Merge branch 'rickard/cross-build-host-triplets-check/ERIERL-668/OTP-17514' i...Rickard Green2021-07-022-0/+34
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Update configure scriptsRickard Green2021-07-021-0/+17
| * | | | | Fail if canonicalized host and build equals when cross compilingRickard Green2021-07-021-0/+17
| | |_|/ / | |/| | |
* | | | | Merge branch 'maint'Dan Gudmundsson2021-06-301-2/+29
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'origin/dgud/erts/test_target' into maintDan Gudmundsson2021-06-301-2/+29
| |\ \ \ \
| | * | | | Support running make test from wslDan Gudmundsson2021-06-241-2/+29
| * | | | | Merge branch 'maint-24' into maintJakub Witczak2021-06-281-0/+9
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | Prepare releaseErlang/OTP2021-06-241-15/+9
| * | | | Merge tag 'OTP-23.1.4.1' into maintHans Nilsson2021-06-071-15/+0
| |\ \ \ \
| | * | | | Prepare releaseErlang/OTP2021-06-071-2/+1
| * | | | | Merge branch 'maint-24' into maintRickard Green2021-06-011-0/+15
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Prepare releaseErlang/OTP2021-06-011-6/+15
* | | | | | Merge branch 'rickard/autoconf-2.71/OTP-17414' into rickard/autoconf-2.71/mas...Rickard Green2021-06-1510-1789/+10409
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update configure scriptsRickard Green2021-06-151-1/+90