Changeset ec8b18a for BOOK


Ignore:
Timestamp:
Apr 26, 2014, 11:09:09 PM (11 years ago)
Author:
Chris Staub <chris@…>
Branches:
clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
cc27223
Parents:
e7d6930 (diff), ee9812b (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' of git.cross-lfs.org:cross-lfs into systemd

Location:
BOOK
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • BOOK/introduction/common/changelog.xml

    re7d6930 rec8b18a  
    5959          as they're no longer needed there.</para>
    6060        </listitem>
     61        <listitem>
     62          <para>[William Harrington] - Update Vim 7.4 branch update patch to
     63          level 265.</para>
     64        </listitem>
    6165      </itemizedlist>
    6266    </listitem>

  • BOOK/patches.ent

    re7d6930 rec8b18a  
    7979<!-- Vim branch update patch area -->
    8080
    81 <!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-2.patch">
    82 <!ENTITY vim-branch_update-patch-md5 "aa2e7384582ddd94ce7e5d91bebce78f">
    83 <!ENTITY vim-branch_update-patch-size "2,740 KB">
     81<!ENTITY vim-branch_update-patch "vim-&vim-version;-branch_update-3.patch">
     82<!ENTITY vim-branch_update-patch-md5 "e7d43252db0a9c00faf2785f9a167516">
     83<!ENTITY vim-branch_update-patch-size "2,858 KB">
    8484
    8585<!-- Start of multilib patches -->
Note: See TracChangeset for help on using the changeset viewer.