[latex3-commits] [git/LaTeX3-latex3-latex2e] TL21-2-protected at write: Merge branch 'develop' into TL21-2-protected at write (cdff125c)

Frank Mittelbach frank.mittelbach at latex-project.org
Fri Jul 16 22:39:30 CEST 2021 

Repository : https://github.com/latex3/latex2e
On branch  : TL21-2-protected at write
Link       : https://github.com/latex3/latex2e/commit/cdff125c8c855c9a3947217f815726cfc6ea90ae

>---------------------------------------------------------------

commit cdff125c8c855c9a3947217f815726cfc6ea90ae
Merge: 374bf65a 15d2beea
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Fri Jul 16 22:39:30 2021 +0200

    Merge branch 'develop' into TL21-2-protected at write
    
    # Conflicts:
    #       base/testfiles-TU/tu-textcomp-003.luatex.tlg
    #       base/testfiles-TU/tu-textcomp-003.tlg
    #       base/testfiles-TU/tu-textcomp-004.luatex.tlg
    #       base/testfiles-TU/tu-textcomp-004.tlg
    #       base/testfiles-TU/tu-tl2e7.luatex.tlg
    #       base/testfiles-TU/tu-tl2e7.tlg
    #       base/testfiles-legacy/tl2e7.tlg
    #       base/testfiles-legacy/tlb-textcomp-001.tlg
    #       base/testfiles-legacy/tlb-textcomp-002.tlg
    #       base/testfiles-legacy/tlb-textcomp-003.tlg
    #       base/testfiles-legacy/tlb-textcomp-004.tlg
    #       base/testfiles-lthooks2/ltpara-001.tlg
    #       base/testfiles-lthooks2/shipout2-011.tlg
    #       base/testfiles/github-0049.luatex.tlg
    #       base/testfiles/github-0049.tlg
    #       base/testfiles/github-0049b.luatex.tlg
    #       base/testfiles/github-0049b.tlg
    #       base/testfiles/tlb-hfloat-01.luatex.tlg
    #       base/testfiles/tlb-hfloat-01.tlg
    #       base/testfiles/tlb0018.luatex.tlg
    #       base/testfiles/tlb0018.tlg
    #       base/testfiles/tlb0027a.tlg
    #       base/testfiles/tlb0027b.tlg
    #       base/testfiles/tlb0150.tlg
    #       base/testfiles/tlb0152.tlg
    #       base/testfiles/tlb0427.tlg
    #       base/testfiles/tlb0574.tlg
    #       base/testfiles/tlb1144.luatex.tlg
    #       base/testfiles/tlb1144.xetex.tlg
    #       base/testfiles/tlb1378.luatex.tlg
    #       base/testfiles/tlb1378.tlg
    #       base/testfiles/tlb1378.xetex.tlg
    #       base/testfiles/tlb1503.tlg
    #       base/testfiles/tlb1519.tlg
    #       base/testfiles/tlb1647.tlg
    #       base/testfiles/tlb1903.luatex.tlg
    #       base/testfiles/tlb1903.tlg
    #       base/testfiles/tlb1903.xetex.tlg
    #       base/testfiles/tlb4023.tlg
    #       base/testfiles/tltc001.luatex.tlg
    #       base/testfiles/tltc001.tlg
    #       base/testfiles/tltx001.luatex.tlg
    #       base/testfiles/tltx001.tlg
    #       base/testfiles/tltx001.xetex.tlg
    #       base/testfiles/tnfss7.luatex.tlg
    #       base/testfiles/tnfss7.tlg
    #       base/testfiles/tnfss7.xetex.tlg
    #       base/testfiles/vlatex02.luatex.tlg
    #       base/testfiles/vlatex02.tlg
    #       base/testfiles/vlatex03-2015.luatex.tlg
    #       base/testfiles/vlatex03-2015.tlg
    #       base/testfiles/vlatex03.luatex.tlg
    #       base/testfiles/vlatex03.tlg
    #       base/testfiles/vlatex04.luatex.tlg
    #       base/testfiles/vlatex04.tlg
    #       base/testfiles/vlatex05.luatex.tlg
    #       base/testfiles/vlatex05.tlg
    #       base/testfiles/vlatex06-2015.luatex.tlg
    #       base/testfiles/vlatex06-2015.tlg
    #       base/testfiles/vlatex06.luatex.tlg
    #       base/testfiles/vlatex06.tlg
    #       base/testfiles/vtl2e02.luatex.tlg
    #       base/testfiles/vtl2e02.tlg
    #       base/testfiles/vtl2e03-2015.luatex.tlg
    #       base/testfiles/vtl2e03-2015.tlg
    #       base/testfiles/vtl2e03.luatex.tlg
    #       base/testfiles/vtl2e03.tlg
    #       base/testfiles/vtl2e04.luatex.tlg
    #       base/testfiles/vtl2e04.tlg
    #       base/testfiles/vtl2e05.luatex.tlg
    #       base/testfiles/vtl2e05.tlg
    #       base/testfiles/vtl2e06.luatex.tlg
    #       base/testfiles/vtl2e06.tlg
    #       required/amsmath/testfiles/github-amsmath-0049.luatex.tlg
    #       required/amsmath/testfiles/github-amsmath-0049.tlg
    #       required/amsmath/testfiles/github-amsmath-0049b.luatex.tlg
    #       required/amsmath/testfiles/github-amsmath-0049b.tlg
    #       required/tools/testfiles-search/tlb-varioref-001.tlg
    #       required/tools/testfiles-search/tlb-varioref-002.tlg
    #       required/tools/testfiles-search/tlb-varioref-003.tlg
    #       required/tools/testfiles-search/tlb-varioref-004.tlg
    #       required/tools/testfiles-search/tlb-varioref-005.tlg
    #       required/tools/testfiles/tlb4159.tlg


>---------------------------------------------------------------


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --textconv --cc cdff125c8c855c9a3947217f815726cfc6ea90ae

More information about the latex3-commits mailing list.