Changeset 2643b9b4 for BOOK/final-system/multilib/eglibc.xml

Timestamp:

Apr 16, 2011, 5:46:52 PM (14 years ago)

Author:

Joe Ciccone <jciccone@…>

Children:

441840b

Parents:

af43a09 (diff), e0ad6ee (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 'master' into simp

File:

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

BOOK/final-system/multilib/eglibc.xml

@@ -29 +29 @@
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='l1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='l2'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l3'])"/>
 
@@ -34 +42 @@
     href="../common/eglibc.xml"
     xpointer="xpointer(//*[@os='l4'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p1'])"/>
+
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+    href="../common/eglibc.xml"
+    xpointer="xpointer(//*[@os='p2'])"/>
 
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"