[latex3-commits] [git/LaTeX3-latex3-latex2e] develop+master: Merge branch 'master' into develop+master (476970d5)
Frank Mittelbach
frank.mittelbach at latex-project.org
Thu Jan 7 19:12:37 CET 2021
Repository : https://github.com/latex3/latex2e
On branch : develop+master
Link : https://github.com/latex3/latex2e/commit/476970d52bbdd7bdce761bf6764e9bbdaa7a34d0
>---------------------------------------------------------------
commit 476970d52bbdd7bdce761bf6764e9bbdaa7a34d0
Merge: c808b5bb 3ee45f0c
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date: Thu Jan 7 19:12:37 2021 +0100
Merge branch 'master' into develop+master
# Conflicts:
# base/README.md
# base/changes.txt
# base/ltfilehook.dtx
# base/lthooks.dtx
# base/ltmiscen.dtx
# base/ltshipout.dtx
# base/ltvers.dtx
# base/testfiles-lthooks/lthooks-000.tlg
# base/testfiles-lthooks/lthooks-001.tlg
# base/testfiles-lthooks/lthooks-002.tlg
# base/testfiles-lthooks/lthooks-003.tlg
# base/testfiles-lthooks/lthooks-004.tlg
# base/testfiles-lthooks/lthooks-005.tlg
# base/testfiles-lthooks/lthooks-006.tlg
# base/testfiles-lthooks/lthooks-007.tlg
# base/testfiles-lthooks/lthooks-008.tlg
# base/testfiles-lthooks/lthooks-009.tlg
# base/testfiles-lthooks/lthooks-011.tlg
# base/testfiles-lthooks/lthooks-013.tlg
# base/testfiles-lthooks/lthooks-021.tlg
# base/testfiles-lthooks/lthooks-legacy.tlg
# base/testfiles-lthooks2/lthooks2-002.tlg
# base/testfiles-lthooks2/lthooks2-005.tlg
# base/testfiles/tlb-latexrelease-rollback-003-often.luatex.tlg
# base/testfiles/tlb-latexrelease-rollback-003-often.tlg
# base/testfiles/tlb-latexrelease-rollback-003-often.xetex.tlg
# base/testfiles/tlb-rollback-004-often.luatex.tlg
# base/testfiles/tlb-rollback-004-often.tlg
# base/testfiles/tlb-rollback-004-often.xetex.tlg
# required/firstaid/changes.txt
# required/firstaid/latex2e-first-aid-for-external-files.dtx
# required/firstaid/testfiles-TU/firstaid-bidi.luatex.tlg
# required/firstaid/testfiles-TU/firstaid-bidi.tlg
>---------------------------------------------------------------
476970d52bbdd7bdce761bf6764e9bbdaa7a34d0
base/build.lua | 1 +
base/changes.txt | 29 +-
base/doc/usrguide3.tex | 701 +++++++++++++++++++++
base/ltfilehook.dtx | 85 +--
base/lthooks.dtx | 28 +-
base/ltmiscen.dtx | 37 +-
base/manifest.txt | 1 +
.../{filehook-002.lvt => github-0464.lvt} | 21 +-
.../testfiles-lthooks/github-0464.tlg | 3 +-
.../tlb-latexrelease-rollback-003-often.luatex.tlg | 8 +-
.../tlb-latexrelease-rollback-003-often.tlg | 8 +-
.../tlb-latexrelease-rollback-003-often.xetex.tlg | 8 +-
base/testfiles/tlb-rollback-004-often.luatex.tlg | 4 +-
base/testfiles/tlb-rollback-004-often.tlg | 4 +-
base/testfiles/tlb-rollback-004-often.xetex.tlg | 4 +-
15 files changed, 821 insertions(+), 121 deletions(-)
More information about the latex3-commits
mailing list.