[latex3-commits] [latex3/latex2e] array: Merge branch 'develop' into array (d15866e4)

github at latex-project.org github at latex-project.org
Wed Dec 20 11:29:35 CET 2023


Repository : https://github.com/latex3/latex2e
On branch  : array
Link       : https://github.com/latex3/latex2e/commit/d15866e4f7d0fc1cf236d40cdd8720aa6550a90c

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

commit d15866e4f7d0fc1cf236d40cdd8720aa6550a90c
Merge: 7cc23b66 61a859f4
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Wed Dec 20 11:29:35 2023 +0100

    Merge branch 'develop' into array
    
    # Conflicts:
    #       required/latex-lab/testfiles-table-luatex/table-004-tabularx.tlg
    #       required/latex-lab/testfiles-table-luatex/table-005.tlg
    #       required/latex-lab/testfiles-table-luatex/table-006-longtable.tlg
    #       required/latex-lab/testfiles-table-luatex/table-007-longtable.tlg
    #       required/latex-lab/testfiles-table-luatex/table-008-multi.tlg
    #       required/latex-lab/testfiles-table-luatex/table-009.tlg
    #       required/latex-lab/testfiles-table-pdftex/table-004-tabularx.tlg
    #       required/latex-lab/testfiles-table-pdftex/table-005.tlg
    #       required/latex-lab/testfiles-table-pdftex/table-006-longtable.tlg
    #       required/latex-lab/testfiles-table-pdftex/table-007-longtable.tlg
    #       required/latex-lab/testfiles-table-pdftex/table-008-multi.tlg
    #       required/latex-lab/testfiles-table-pdftex/table-009.tlg


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


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

    git diff-tree --root --patch-with-stat --no-color --ignore-space-at-eol --textconv --ext-diff --cc d15866e4f7d0fc1cf236d40cdd8720aa6550a90c




More information about the latex3-commits mailing list.