[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Merge branch 'gh440' into develop (1faea67c)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : develop
Link       : https://github.com/latex3/latex2e/commit/1faea67caedaf0805671896c5c56706a9ca727c5

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

commit 1faea67caedaf0805671896c5c56706a9ca727c5
Merge: 50818720 ab8187d3
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Sun Jan 17 12:05:26 2021 +0100

    Merge branch 'gh440' into develop
    
    # Conflicts:
    #       base/ltshipout.dtx


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

1faea67caedaf0805671896c5c56706a9ca727c5
 base/changes.txt                                |  5 +++
 base/format.ins                                 |  1 -
 base/ltshipout.dtx                              | 60 +++----------------------
 base/testfiles-lthooks2/shipout2-emulations.tlg |  5 +--
 support/texlive.sh                              |  1 +
 5 files changed, 13 insertions(+), 59 deletions(-)

diff --cc base/ltshipout.dtx
index 7b5fdfdf,0ea285a9..bffe97f3
--- a/base/ltshipout.dtx
+++ b/base/ltshipout.dtx
@@@ -1,6 -1,6 +1,7 @@@
  % \iffalse meta-comment
  %%
- %% File: ltshipout.dtx (C) Copyright 2020,2021 Frank Mittelbach, LaTeX Team
 -%% File: ltshipout.dtx (C) Copyright 2020-2021 Frank Mittelbach, LaTeX Team
++%% Copyright (C) 2020-2021
++%%               Frank Mittelbach, LaTeX Team
  %%
  %
  % This file is part of the LaTeX base system.
@@@ -31,8 -31,8 +32,8 @@@
  %%% From File: ltshipout.dtx
  %
  %    \begin{macrocode}
- \providecommand\ltshipoutversion{v1.0d}
+ \providecommand\ltshipoutversion{v1.0e}
 -\providecommand\ltshipoutdate{2021/01/08}
 +\providecommand\ltshipoutdate{2021/01/15}
  %    \end{macrocode}
  %
  %<*driver>