[latex3-commits] [git/LaTeX3-latex3-latex2e] lthooks: Merge commit 'c4e0a272d140ea23d31f2dffbe4cfa526b51e21c' into lthooks (this is gh337) (1af53037)

[Frank Mittelbach]

Repository : https://github.com/latex3/latex2e
On branch  : lthooks
Link       : https://github.com/latex3/latex2e/commit/1af53037f6798fc882b115e72208c1f12c840a76

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

commit 1af53037f6798fc882b115e72208c1f12c840a76
Merge: 23e512c8 c4e0a272
Author: Frank Mittelbach <frank.mittelbach at latex-project.org>
Date:   Thu Jul 16 15:33:54 2020 +0200

    Merge commit 'c4e0a272d140ea23d31f2dffbe4cfa526b51e21c' into lthooks (this is gh337)


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

1af53037f6798fc882b115e72208c1f12c840a76
 base/changes.txt  |   5 ++
 base/docstrip.dtx | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 173 insertions(+), 12 deletions(-)

diff --cc base/changes.txt
index c7a032ca,1bf27c15..24deb18d
--- a/base/changes.txt
+++ b/base/changes.txt
@@@ -19,6 -14,10 +19,11 @@@ are not part of the distribution
  	* ltfinal.dtx:
  	Execute hook \@expl at finalise@setup@@
  
+ 2020-07-07  Johannes Braams  <Johannes.Braams at latex-project.org>
+ 
+ 	* docstrip.dtx: Merge the @@-module functionality of
+ 	l3docstrip.dtx into docstrip.dtx (gh/337)
++
  2020-07-04  Marcel Krüger  <Marcel.Krueger at latex-project.org>
  
  	* ltoutenc.dtx: