Changeset ecf55d8 for chapter01/whatsnew.xml

Timestamp:

07/09/2021 06:29:57 AM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

ml-11.0, multilib

Children:

aea9d3b

Parents:

d49a0358 (diff), 87119fd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

File:

• chapter01/whatsnew.xml (modified) (4 diffs)

chapter01/whatsnew.xml

@@ -139 +139 @@
       <para>IPRoute2-&iproute2-version;</para>
     </listitem>
+    <!--<listitem revision="systemd">
+      <para>Jinja2-&jinja2-version;</para>
+    </listitem>-->
     <!--<listitem>
       <para>Kbd-&kbd-version;</para>
@@ -181 +184 @@
       <para>Man-pages-&man-pages-version;</para>
     </listitem>
+    <!--<listitem revision="systemd">
+      <para>MarkupSafe-&markupsafe-version;</para>
+    </listitem>-->
     <listitem>
       <para>Meson-&meson-version;</para>
@@ -241 +247 @@
       <para>Tcl-&tcl-version;</para>
     </listitem>-->
-    <!--<listitem>
+    <listitem>
       <para>Texinfo-&texinfo-version;</para>
-    </listitem>-->
+    </listitem>
     <!--<listitem>
       <para>Tzdata-&tzdata-version;</para>
@@ -285 +291 @@
       <para>gcc-11.1.0-upstream_fixes-1.patch</para>
     </listitem>
-    <listitem>
-      <para>systemd-247-upstream_fixes-2.patch</para>
-    </listitem>
-    <listitem>
-      <para>systemd-247-upstream_fixes-1.patch</para>
+    <listitem revision="systemd">
+      <para>MarkupSafe-&markupsafe-version;</para>
+    </listitem>
+    <listitem revision="systemd">
+      <para>Jinja2-&jinja2-version;</para>
     </listitem>