[lfs] 01/01: Merge trunk - recolve conflicts
| Newsgroups | gmane.linux.lfs.book |
|---|---|
| Message-ID | <[email protected]> |
This is an automated email from the git hooks/post-receive script. git pushed a commit to branch multilib in repository lfs. commit b2e7bec512bbaed0f9fae66da6f4dcd210326d3b Merge: 57f97c0ed f8e7537a1 Author: Thomas Trepl <[email protected]> AuthorDate: Sun Aug 3 08:33:41 2025 +0200 Merge trunk - recolve conflicts chapter01/changelog.xml | 34 ++++++++++++++++++++++++++++++++-- chapter01/whatsnew.xml | 8 ++++---- chapter06/gcc-pass2.xml | 4 ---- chapter07/cleanup.xml | 4 ++-- chapter08/gcc.xml | 9 ++++++--- chapter08/inetutils.xml | 16 ++++++++++------ chapter08/texinfo.xml | 5 +++++ packages.ent | 36 ++++++++++++++++++------------------ prologue/typography.xml | 5 ++++- stylesheets/lfs-xsl/lfs.css | 4 ++++ 10 files changed, 85 insertions(+), 40 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository. -- http://lists.linuxfromscratch.org/sympa/info/lfs-book Unsubscribe: See the above information page