aboutsummaryrefslogtreecommitdiffstats
path: root/make
AgeCommit message (Collapse)Author
2019-06-18Merge branch 'maint-22' into maintJohn Högberg
* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
2019-06-17Prepare releaseErlang/OTP
2019-06-17Merge branch 'maint-20' into maintJohn Högberg
* maint-20: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/common_test/doc/src/notes.xml # lib/common_test/vsn.mk # lib/tools/doc/src/notes.xml # lib/tools/vsn.mk # make/otp_version_tickets # otp_versions.table
2019-06-14Prepare releaseErlang/OTP
2019-06-13Merge branch 'maint-22' into maintJohn Högberg
* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
2019-06-12Prepare releaseErlang/OTP
2019-06-04Merge branch 'maint-21' into maintIngela Anderton Andin
* maint-21: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/kernel/doc/src/notes.xml # lib/kernel/src/kernel.appup.src # lib/kernel/vsn.mk # lib/ssl/doc/src/notes.xml # lib/ssl/vsn.mk # lib/stdlib/doc/src/notes.xml # lib/stdlib/src/stdlib.appup.src # lib/stdlib/vsn.mk # make/otp_version_tickets # otp_versions.table
2019-06-03Merge branch 'maint-22' into maintHans Bolinder
* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
2019-06-03Prepare releaseErlang/OTP
2019-05-29Prepare releaseErlang/OTP
2019-05-20Merge branch 'maint-22' into maintIngela Anderton Andin
* maint-22: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
2019-05-15Prepare releaseErlang/OTP
2019-05-15Prepare releaseErlang/OTP
2019-05-15Merge branch 'maint-21' into maintIngela Anderton Andin
* maint-21: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/ssl/doc/src/notes.xml # lib/ssl/vsn.mk # lib/tools/doc/src/notes.xml # lib/tools/vsn.mk # make/otp_version_tickets # otp_versions.table
2019-05-14Bump patch merge versionRickard Green
2019-05-14Prepare releaseErlang/OTP
2019-05-10Prepare releaseErlang/OTP
2019-05-09Merge branch 'maint'Rickard Green
* maint: Bump forward merge script version
2019-05-09Bump forward merge script versionRickard Green
2019-05-07Merge branch 'maint-21' into maintIngela Anderton Andin
* maint-21: Updated OTP version Prepare release
2019-05-06Prepare releaseErlang/OTP
2019-04-30[socket] Preliminary - make socket configurableMicael Karlberg
Preliminary work to make socket configurable (enable and disable). OTP-15658
2019-04-26Merge branch 'maint-21' into maintHans Nilsson
* maint-21: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
2019-04-24Prepare releaseErlang/OTP
2019-04-24Revert "Prepare release"Rickard Green
This reverts commit 425889ba69b69a9b6fb14bfbef121d51b78e853a.
2019-04-23Prepare releaseErlang/OTP
2019-04-18Merge branch 'maint-21' into maintRaimo Niskanen
* maint-21: Updated OTP version Prepare release Conflicts: make/otp_version_tickets
2019-04-18Merge branch 'maint'Raimo Niskanen
* maint: Bump otp_patch_solve_forward_merge_version
2019-04-18Bump otp_patch_solve_forward_merge_versionRaimo Niskanen
2019-04-17Prepare releaseErlang/OTP
2019-04-17Merge branch 'maint-20' into maintMicael Karlberg
* maint-20: Updated OTP version Prepare release # Conflicts: # OTP_VERSION # erts/doc/src/notes.xml # erts/vsn.mk # lib/common_test/doc/src/notes.xml # lib/common_test/vsn.mk # lib/erl_interface/doc/src/notes.xml # lib/erl_interface/vsn.mk # lib/snmp/doc/src/notes.xml # lib/snmp/vsn.mk # lib/ssh/doc/src/notes.xml # lib/ssh/vsn.mk # lib/tools/doc/src/notes.xml # lib/tools/vsn.mk # make/otp_version_tickets # otp_versions.table
2019-04-16Prepare releaseErlang/OTP
2019-04-16Merge branch 'rickard/make-fixes-20/OTP-15657' into maint-20Erlang/OTP
* rickard/make-fixes-20/OTP-15657: Remove own configured RM make variable
2019-04-16Merge branch 'rickard/make-fixes-20/OTP-15551' into maint-20Erlang/OTP
* rickard/make-fixes-20/OTP-15551: Fix install phase in build system
2019-04-15Rephrase progress printoutBjörn Gustavsson
Use the progressive verb form for consistency with other progress printouts from Makefiles.
2019-04-15Merge branch 'maint-21' into maintRickard Green
* maint-21: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
2019-04-15Prepare releaseErlang/OTP
2019-04-12Merge branch 'maint-21' into maintHans Nilsson
* maint-21: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
2019-04-12Prepare releaseErlang/OTP
2019-04-04emd2exml: Remove paragraphs around image tagsBjörn Gustavsson
Figure numbering will be messed up if an image tag is inside a paragraph.
2019-04-04emd2exml: Clean emphasis markers in link textsBjörn Gustavsson
Our DTD does not allow any nested tags in link texts.
2019-04-04emd2exml: Allow short names of anchors for internal linksBjörn Gustavsson
Links within a document required writing the entire name of the generated anchor. Basically, that makes it possible to writing internal links that will be translated correctly both by emd2exml and by Github.
2019-04-04erts: Fix more internal docs xmllintLukas Larsson
2019-04-01Merge branch 'maint-21' into maintSverker Eriksson
* maint-21: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
2019-03-29Prepare releaseErlang/OTP
2019-03-26Revert "Prepare release"Henrik Nord
This reverts commit 0118046f9bda8dcf3594184fa439b79267db8017.
2019-03-25Prepare releaseErlang/OTP
2019-03-22Merge branch 'maint-21' into maintRickard Green
* maint-21: Updated OTP version Prepare release # Conflicts: # make/otp_version_tickets
2019-03-21Merge branch 'maint'Rickard Green
2019-03-21Bump patch solve forward merge versionRickard Green
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 16:03:58 +0000