Changeset 03e6a40 for BOOK/final-system/multilib/diffutils.xml

Timestamp:

Apr 20, 2014, 8:57:39 AM (11 years ago)

Author:

Chris Staub <chris@…>

Children:

0be79ea

Parents:

88ef769 (diff), 578ca586 (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:

Merge branch 'systemd' into simp

Conflicts:

BOOK/final-system/common/bash.xml
BOOK/final-system/mips64-chapter.xml
BOOK/final-system/multilib/bash.xml
BOOK/final-system/ppc64-chapter.xml
BOOK/final-system/sparc64-chapter.xml
BOOK/final-system/x86_64-chapter.xml
BOOK/general.ent
BOOK/packages.ent
BOOK/temp-system/common/bash.xml
BOOK/temp-system/mips64-64-chapter.xml
BOOK/temp-system/mips64-chapter.xml
BOOK/temp-system/multilib/bash.xml
BOOK/temp-system/ppc64-64-chapter.xml
BOOK/temp-system/ppc64-chapter.xml
BOOK/temp-system/sparc64-64-chapter.xml
BOOK/temp-system/sparc64-chapter.xml
BOOK/temp-system/x86_64-64-chapter.xml
BOOK/temp-system/x86_64-chapter.xml

File:

• BOOK/final-system/multilib/diffutils.xml (modified) (2 diffs)

BOOK/final-system/multilib/diffutils.xml

@@ -24 +24 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='s1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/diffutils.xml"
+    xpointer="xpointer(//*[@os='s2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/diffutils.xml"
     xpointer="xpointer(//*[@os='a'])"/>
 
@@ -30 +38 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='s1'])"/>
+    xpointer="xpointer(//*[@os='s3'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/diffutils.xml"
-    xpointer="xpointer(//*[@os='s2'])"/>
+    xpointer="xpointer(//*[@os='s4'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"