[latex3-commits] [git/LaTeX3-latex3-iftex] master: Merge remote-tracking branch 'upstream/master' (5c6dcf1)

[mrpiggi]

Repository : https://github.com/latex3/iftex
On branch  : master
Link       : https://github.com/latex3/iftex/commit/5c6dcf1787f799c779bfd7691ce3143eb6c0b7cc

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

commit 5c6dcf1787f799c779bfd7691ce3143eb6c0b7cc
Merge: 2a9908c 9c75988
Author: mrpiggi <hanisch.latex at outlook.com>
Date:   Tue Nov 5 13:58:12 2019 +0100

    Merge remote-tracking branch 'upstream/master'


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

5c6dcf1787f799c779bfd7691ce3143eb6c0b7cc
 iftex.sty                                                 | 15 +++++++++++++--
 .../plain-ifxetex1.tlg => testfiles/scrbase1.luatex.tlg   |  2 +-
 testfiles/scrbase1.lvt                                    | 13 +++++++++++++
 .../plain-ifxetex1.tlg => testfiles/scrbase1.ptex.tlg     |  2 +-
 testfiles/{ifxetex1.xetex.tlg => scrbase1.tlg}            |  2 +-
 .../plain-ifxetex1.tlg => testfiles/scrbase1.uptex.tlg    |  2 +-
 .../plain-ifxetex1.tlg => testfiles/scrbase1.xetex.tlg    |  2 +-
 .../active1.luatex.tlg => testfiles/scrbase2.luatex.tlg   |  4 ++--
 testfiles/scrbase2.lvt                                    | 15 +++++++++++++++
 .../active1.luatex.tlg => testfiles/scrbase2.ptex.tlg     |  4 ++--
 .../scrbase2.tlg                                          |  3 ++-
 .../active1.luatex.tlg => testfiles/scrbase2.uptex.tlg    |  4 ++--
 .../active1.luatex.tlg => testfiles/scrbase2.xetex.tlg    |  4 ++--
 13 files changed, 56 insertions(+), 16 deletions(-)