Changeset 7cb9b1d for BOOK/patches.ent


Ignore:
Timestamp:
May 29, 2014, 12:58:23 AM (10 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, master, systemd
Children:
000a8f8
Parents:
fcc84cc (diff), 67d6f59 (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' of git.cross-lfs.org:cross-lfs

Conflicts:

BOOK/introduction/common/changelog.xml

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/patches.ent

    rfcc84cc r7cb9b1d  
    6262
    6363<!ENTITY systemd-compat-patch "systemd-&systemd-version;-compat-1.patch">
    64 <!ENTITY systemd-compat-patch-md5 "09bfa3f4b09620555aa107e48a4f850b">
    65 <!ENTITY systemd-compat-patch-size "9.244 KB">
     64<!ENTITY systemd-compat-patch-md5 "2a5816fdfc8bd2376a40c382004ad1ac">
     65<!ENTITY systemd-compat-patch-size "7.863 KB">
    6666
    6767<!ENTITY sysvinit-tools_updates-patch "sysvinit-&sysvinit-version;-tools_updates-1.patch">
Note: See TracChangeset for help on using the changeset viewer.