Ignore:
Timestamp:
May 17, 2014, 8:41:51 AM (10 years ago)
Author:
William Harrington <kb0iic@…>
Branches:
clfs-3.0.0-sysvinit, sysvinit
Children:
3205da5
Parents:
b4badbd (diff), 156c0fe (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:

Fix conflicts with merge.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • BOOK/introduction/common/changelog.xml

    rb4badbd r1ab9a96  
    4343          <para>[William Harrington] - Move <command>logger</command> to
    4444          <filename class="directory">/bin</filename> for CLFS-Bootscripts
     45        </listitem>
     46        <listitem>
    4547          requirement..</para>
     48          <para>[Chris] - Changed "systemd" reference on Kbd page to
     49          CLFS Bootscripts, and added dumpkeys and kbd_mode to list of
     50          programs moved to /bin as they're used in the bootscripts.</para>
    4651        </listitem>
    4752      </itemizedlist>
Note: See TracChangeset for help on using the changeset viewer.